Cleanup: Get rid of base::WideToUTF16Hack.

chrome/browser/importer/ie_importer_browsertest_win.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // The order of these includes is important.
 #include <windows.h>
 #include <unknwn.h>
 #include <intshcut.h>
 #include <propvarutil.h>
 #include <shlguid.h>
@@ skipping 31 matching lines @@
 #include "chrome/common/importer/importer_data_types.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/os_crypt/ie7_password_win.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 const BookmarkInfo kIEBookmarks[] = {
-  {true, 2, {L"Links", L"SubFolderOfLinks"},
-   L"SubLink",
-   "http://www.links-sublink.com/"},
-  {true, 1, {L"Links"},
-   L"TheLink",
-   "http://www.links-thelink.com/"},
+  {true, 2, {"Links", "SubFolderOfLinks"},
+    L"SubLink",
+    "http://www.links-sublink.com/"},
+  {true, 1, {"Links"},
+    L"TheLink",
+    "http://www.links-thelink.com/"},
   {false, 0, {},
-   L"Google Home Page",
-   "http://www.google.com/"},
+    L"Google Home Page",
+    "http://www.google.com/"},
   {false, 0, {},
-   L"TheLink",
-   "http://www.links-thelink.com/"},
-  {false, 1, {L"SubFolder"},
-   L"Title",
-   "http://www.link.com/"},
+    L"TheLink",
+    "http://www.links-thelink.com/"},
+  {false, 1, {"SubFolder"},
+    L"Title",
+    "http://www.link.com/"},
   {false, 0, {},
-   L"WithPortAndQuery",
-   "http://host:8080/cgi?q=query"},
-  {false, 1, {L"a"},
-   L"\x4E2D\x6587",
-   "http://chinese-title-favorite/"},
+    L"WithPortAndQuery",
+    "http://host:8080/cgi?q=query"},
+  {false, 1, {"a"},
+    L"\x4E2D\x6587",
+    "http://chinese-title-favorite/"},
   {false, 0, {},
-   L"SubFolder",
-   "http://www.subfolder.com/"},
+    L"SubFolder",
+    "http://www.subfolder.com/"},
 };
 
 const BookmarkInfo kIESortedBookmarks[] = {
   {false, 0, {}, L"a", "http://www.google.com/0"},
-  {false, 1, {L"b"}, L"a", "http://www.google.com/1"},
-  {false, 1, {L"b"}, L"b", "http://www.google.com/2"},
+  {false, 1, {"b"}, L"a", "http://www.google.com/1"},
+  {false, 1, {"b"}, L"b", "http://www.google.com/2"},
   {false, 0, {}, L"c", "http://www.google.com/3"},
 };
 
 const base::char16 kIEIdentifyUrl[] =
     L"http://A79029D6-753E-4e27-B807-3D46AB1545DF.com:8080/path?key=value";
 const base::char16 kIEIdentifyTitle[] =
     L"Unittest GUID";
 
 const base::char16 kFaviconStreamSuffix[] = L"url:favicon:$DATA";
 const char kDummyFaviconImageData[] =
     "\x42\x4D"          // Magic signature 'BM'
     "\x1E\x00\x00\x00"  // File size
     "\x00\x00\x00\x00"  // Reserved
     "\x1A\x00\x00\x00"  // Offset of the pixel data
     "\x0C\x00\x00\x00"  // Header Size
     "\x01\x00\x01\x00"  // Size: 1x1
     "\x01\x00"          // Reserved
     "\x18\x00"          // 24-bits
     "\x00\xFF\x00\x00"; // The pixel
 
 struct FaviconGroup {
   const base::char16* favicon_url;
   const base::char16* site_url[2];
 };
 
 const FaviconGroup kIEFaviconGroup[2] = {
   {L"http://www.google.com/favicon.ico",
-   {L"http://www.google.com/",
-    L"http://www.subfolder.com/"}},
+    {L"http://www.google.com/",
+      L"http://www.subfolder.com/"}},
   {L"http://example.com/favicon.ico",
-   {L"http://host:8080/cgi?q=query",
-    L"http://chinese-title-favorite/"}},
+    {L"http://host:8080/cgi?q=query",
+      L"http://chinese-title-favorite/"}},
 };
 
 bool CreateOrderBlob(const base::FilePath& favorites_folder,
                      const base::string16& path,
                      const std::vector<base::string16>& entries) {
   if (entries.size() > 255)
     return false;
 
   // Create a binary sequence for setting a specific order of favorites.
   // The format depends on the version of Shell32.dll, so we cannot embed
@@ skipping 503 matching lines @@
   source_profile.source_path = temp_dir_.path();
 
   host->StartImportSettings(
       source_profile,
       browser()->profile(),
       importer::HOME_PAGE,
       observer);
   base::MessageLoop::current()->Run();
 }