Update some uses of char16 to use the base:: namespace.

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 65 matching lines @@
    "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, 0, {}, L"c", "http://www.google.com/3"},
 };
 
-const char16 kIEIdentifyUrl[] =
+const base::char16 kIEIdentifyUrl[] =
     L"http://A79029D6-753E-4e27-B807-3D46AB1545DF.com:8080/path?key=value";
-const char16 kIEIdentifyTitle[] =
+const base::char16 kIEIdentifyTitle[] =
     L"Unittest GUID";
 
-const char16 kFaviconStreamSuffix[] = L"url:favicon:$DATA";
+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 char16* favicon_url;
-  const char16* site_url[2];
+  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://example.com/favicon.ico",
    {L"http://host:8080/cgi?q=query",
     L"http://chinese-title-favorite/"}},
 };
@@ skipping 93 matching lines @@
 }
 
 bool CreateUrlFile(const base::FilePath& file, const base::string16& url) {
   return CreateUrlFileWithFavicon(file, url, base::string16());
 }
 
 void ClearPStoreType(IPStore* pstore, const GUID* type, const GUID* subtype) {
   base::win::ScopedComPtr<IEnumPStoreItems, NULL> item;
   HRESULT result = pstore->EnumItems(0, type, subtype, 0, item.Receive());
   if (result == PST_E_OK) {
-    char16* item_name;
+    base::char16* item_name;
     while (SUCCEEDED(item->Next(1, &item_name, 0))) {
       pstore->DeleteItem(0, type, subtype, item_name, NULL, 0);
       CoTaskMemFree(item_name);
     }
   }
   pstore->DeleteSubtype(0, type, subtype, 0);
   pstore->DeleteType(0, type, 0);
 }
 
 void WritePStore(IPStore* pstore, const GUID* type, const GUID* subtype) {
   struct PStoreItem {
-    char16* name;
+    base::char16* name;
     int data_size;
     char* data;
   } items[] = {
     {L"http://localhost:8080/security/index.htm#ref:StringData", 8,
      "\x31\x00\x00\x00\x32\x00\x00\x00"},
     {L"http://localhost:8080/security/index.htm#ref:StringIndex", 20,
      "\x57\x49\x43\x4b\x18\x00\x00\x00\x02\x00"
      "\x00\x00\x2f\x00\x74\x00\x01\x00\x00\x00"},
     {L"user:StringData", 4,
      "\x31\x00\x00\x00"},
@@ skipping 252 matching lines @@
   ASSERT_TRUE(CreateUrlFile(links_path.AppendASCII("TheLink.url"),
                             L"http://www.links-thelink.com/"));
   ASSERT_TRUE(CreateUrlFile(
       links_path.AppendASCII("SubFolderOfLinks").AppendASCII("SubLink.url"),
       L"http://www.links-sublink.com/"));
   ASSERT_TRUE(CreateUrlFile(path.AppendASCII("IEDefaultLink.url"),
                             L"http://go.microsoft.com/fwlink/?linkid=140813"));
   file_util::WriteFile(path.AppendASCII("InvalidUrlFile.url"), "x", 1);
   file_util::WriteFile(path.AppendASCII("PlainTextFile.txt"), "x", 1);
 
-  const char16* root_links[] = {
+  const base::char16* root_links[] = {
     L"Links",
     L"Google Home Page.url",
     L"TheLink.url",
     L"SubFolder",
     L"WithPortAndQuery.url",
     L"a",
     L"SubFolder.url",
   };
   ASSERT_TRUE(CreateOrderBlob(
       base::FilePath(path), L"",
@@ skipping 153 matching lines @@
   source_profile.source_path = temp_dir_.path();
 
   host->StartImportSettings(
       source_profile,
       browser()->profile(),
       importer::HOME_PAGE,
       observer);
   base::MessageLoop::current()->Run();
 }