Add base:: to string16s in win8/.

win8/metro_driver/winrt_utils.cc

 // Copyright (c) 2012 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.
 
 #include "stdafx.h"
 #include "winrt_utils.h"
 
 #include <shlobj.h>
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/win/scoped_com_initializer.h"
 #include "base/win/scoped_comptr.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/install_util.h"
 
 void CheckHR(HRESULT hr, const char* message) {
   if (FAILED(hr)) {
     if (message)
       PLOG(DFATAL) << message << ", hr = " << std::hex << hr;
     else
       PLOG(DFATAL) << "COM ERROR" << ", hr = " << std::hex << hr;
   }
 }
 
-HSTRING MakeHString(const string16& str) {
+HSTRING MakeHString(const base::string16& str) {
   HSTRING hstr;
   if (FAILED(::WindowsCreateString(str.c_str(), static_cast<UINT32>(str.size()),
                                    &hstr))) {
     PLOG(DFATAL) << "Hstring creation failed";
   }
   return hstr;
 }
 
-string16 MakeStdWString(HSTRING hstring) {
+base::string16 MakeStdWString(HSTRING hstring) {
   const wchar_t* str;
   UINT32 size = 0;
   str = ::WindowsGetStringRawBuffer(hstring, &size);
   if (!size)
-    return string16();
-  return string16(str, size);
+    return base::string16();
+  return base::string16(str, size);
 }
 
 namespace {
 
 #define IMPLEMENT_CREATE_PROPERTY(Name, Type) \
 HRESULT Create ## Name ## Property(Type value, \
                                    winfoundtn::IPropertyValue** prop) { \
   mswr::ComPtr<winfoundtn::IPropertyValueStatics> property_value_statics; \
   HRESULT hr = winrt_utils::CreateActivationFactory( \
       RuntimeClass_Windows_Foundation_PropertyValue, \
@@ skipping 111 matching lines @@
       break;
     }
     default: {
       hr = E_NOTIMPL;
     }
   }
   return hr;
 }
 
 bool GetArgumentsFromShortcut(const base::FilePath& shortcut,
-                              string16* arguments) {
+                              base::string16* arguments) {
   HRESULT result;
   base::win::ScopedComPtr<IShellLink> i_shell_link;
   bool is_resolved = false;
 
 
   base::win::ScopedCOMInitializer sta_com_initializer;
 
   // Get pointer to the IShellLink interface
   result = i_shell_link.CreateInstance(CLSID_ShellLink, NULL,
                                        CLSCTX_INPROC_SERVER);
   if (SUCCEEDED(result)) {
     base::win::ScopedComPtr<IPersistFile> persist;
     // Query IShellLink for the IPersistFile interface
     result = persist.QueryFrom(i_shell_link);
     if (SUCCEEDED(result)) {
       WCHAR temp_arguments[MAX_PATH];
       // Load the shell link
       result = persist->Load(shortcut.value().c_str(), STGM_READ);
       if (SUCCEEDED(result)) {
         result = i_shell_link->GetArguments(temp_arguments, MAX_PATH);
         *arguments = temp_arguments;
         is_resolved = true;
       }
     }
   }
 
   return is_resolved;
 }
 
-string16 ReadArgumentsFromPinnedTaskbarShortcut() {
+base::string16 ReadArgumentsFromPinnedTaskbarShortcut() {
   wchar_t path_buffer[MAX_PATH] = {};
 
   if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_APPDATA, NULL,
                                 SHGFP_TYPE_CURRENT, path_buffer))) {
     base::FilePath shortcut(path_buffer);
     shortcut = shortcut.Append(
         L"Microsoft\\Internet Explorer\\Quick Launch\\User Pinned\\TaskBar");
 
     BrowserDistribution* dist = BrowserDistribution::GetDistribution();
     base::string16 link_name = dist->GetShortcutName(
         BrowserDistribution::SHORTCUT_CHROME) + installer::kLnkExt;
     shortcut = shortcut.Append(link_name);
 
-    string16 arguments;
+    base::string16 arguments;
     if (GetArgumentsFromShortcut(shortcut, &arguments)) {
       return arguments;
     }
   }
 
   return L"";
 }
 
 }  // namespace winrt_utils