Reland "Implement StringFromGUID2 natively in Chromium"

This reverts commit 214190dc4356ab37124397201c0aaa3b58b99072.

Reason for revert: Original change was not the cause of the test
failure. The test failed to find a string resource which is unrelated
to the StringFromGUID2 changes in this CL.

Original change's description:
> Revert "Implement StringFromGUID2 natively in Chromium"
>
> This reverts commit b11abed764771d0fdf240e1f6375997baf3f0f59.
>
> Reason for revert: Suspect causing failure on Win7 Tests (dbg)(1) bot.
>
> Original change's description:
> > Implement StringFromGUID2 natively in Chromium
> >
> > This change implements StringFromGUID2 natively in Chromium in order to
> > avoid calling into ole32.dll. This is necessary to support the effort to
> > delayload user32.dll and gdi32.dll because StringFromGUID2 has some
> > callers in the renderer process and delayloading ole32.dll for this
> > method call will cause the process to crash.
> >
> > Bug: 948829
> > Change-Id: I00a2d5735984268813ecccc43aa3cb464d21c62c
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1575869
> > Commit-Queue: Cliff Smolinsky <cliffsmo@microsoft.com>
> > Reviewed-by: Scott Violet <sky@chromium.org>
> > Reviewed-by: Reilly Grant <reillyg@chromium.org>
> > Reviewed-by: Tommi <tommi@chromium.org>
> > Reviewed-by: Misha Efimov <mef@chromium.org>
> > Reviewed-by: Greg Thompson <grt@chromium.org>
> > Reviewed-by: Bruce Dawson <brucedawson@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#654978}
>
> TBR=sky@chromium.org,tommi@chromium.org,mef@chromium.org,reillyg@chromium.org,emircan@chromium.org,brucedawson@chromium.org,ortuno@chromium.org,wfh@chromium.org,chfremer@chromium.org,grt@chromium.org,dougt@chromium.org,odejesush@chromium.org,cliffsmo@microsoft.com
>
> Change-Id: I8e434cfcab9a1626e435169e0a4d52991a3351c7
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 957991
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1590055
> Reviewed-by: Ella Ge <eirage@chromium.org>
> Commit-Queue: Ella Ge <eirage@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#655239}

TBR=sky@chromium.org,tommi@chromium.org,mef@chromium.org,reillyg@chromium.org,emircan@chromium.org,brucedawson@chromium.org,ortuno@chromium.org,wfh@chromium.org,chfremer@chromium.org,grt@chromium.org,dougt@chromium.org,eirage@chromium.org,odejesush@chromium.org,cliffsmo@microsoft.com

Change-Id: Ie65fb1f45d50c1693a38d1a13ad5b868f4c50626
Bug: 957991,948829
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1590061
Commit-Queue: Cliff Smolinsky <cliffsmo@microsoft.com>
Reviewed-by: Ella Ge <eirage@chromium.org>
Reviewed-by: Will Harris <wfh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#655392}


CrOS-Libchrome-Original-Commit: 819516407b8c768dc4c5f0c9eef2930d10401d17

1 files changed, 4 insertions, 7 deletions

diff --git a/device/bluetooth/bluetooth_uuid.cc b/device/bluetooth/bluetooth_uuid.cc
index 88e2736339..0fbf22d471 100644
--- a/device/bluetooth/bluetooth_uuid.cc
+++ b/device/bluetooth/bluetooth_uuid.cc
@@ -15,6 +15,7 @@
 #include <objbase.h>
 
 #include "base/strings/string16.h"
+#include "base/win/win_util.h"
 #endif  // defined(OS_WIN)
 
 namespace device {
@@ -79,16 +80,12 @@ BluetoothUUID::BluetoothUUID(const std::string& uuid) {
 
 #if defined(OS_WIN)
 BluetoothUUID::BluetoothUUID(GUID uuid) {
-  // 36 chars for UUID + 2 chars for braces + 1 char for null-terminator.
-  constexpr int kBufferSize = 39;
-  wchar_t buffer[kBufferSize];
-  int result = ::StringFromGUID2(uuid, buffer, kBufferSize);
-  DCHECK_EQ(kBufferSize, result);
+  auto buffer = base::win::String16FromGUID(uuid);
   DCHECK_EQ('{', buffer[0]);
   DCHECK_EQ('}', buffer[37]);
 
-  GetCanonicalUuid(base::WideToUTF8(base::WStringPiece(buffer).substr(1, 36)),
-                   &value_, &canonical_value_, &format_);
+  GetCanonicalUuid(base::WideToUTF8(buffer.substr(1, 36)), &value_,
+                   &canonical_value_, &format_);
   DCHECK_EQ(kFormat128Bit, format_);
 }
 #endif  // defined(OS_WIN)