Add base:: to string16s in win8/.

win8/delegate_execute/delegate_execute.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 "build/intsafe_workaround.h"
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <atlctl.h>
 #include <initguid.h>
@@ skipping 29 matching lines @@
  public :
   typedef ATL::CAtlExeModuleT<DelegateExecuteModule> ParentClass;
   typedef CComObject<CommandExecuteImpl> ImplType;
 
   DelegateExecuteModule()
       : registration_token_(0) {
   }
 
   HRESULT PreMessageLoop(int nShowCmd) {
     HRESULT hr = S_OK;
-    string16 clsid_string;
+    base::string16 clsid_string;
     GUID clsid;
     BrowserDistribution* dist = BrowserDistribution::GetDistribution();
     if (!dist->GetCommandExecuteImplClsid(&clsid_string))
       return E_FAIL;
     hr = ::CLSIDFromString(clsid_string.c_str(), &clsid);
     if (FAILED(hr))
       return hr;
 
     // We use the same class creation logic as ATL itself.  See
     // _ATL_OBJMAP_ENTRY::RegisterClassObject() in atlbase.h
@@ skipping 53 matching lines @@
     } else {
       AtlTrace("Failed to wait for relaunch mutex, result is 0x%x\n", result);
     }
   } else {
     // It is possible that chrome exits so fast that the mutex is not there.
     AtlTrace("No relaunch mutex found\n");
   }
 
   base::win::ScopedCOMInitializer com_initializer;
 
-  string16 relaunch_flags(operation.relaunch_flags());
+  base::string16 relaunch_flags(operation.relaunch_flags());
   SHELLEXECUTEINFO sei = { sizeof(sei) };
   sei.fMask = SEE_MASK_FLAG_LOG_USAGE;
   sei.nShow = SW_SHOWNORMAL;
   sei.lpFile = operation.shortcut().value().c_str();
   sei.lpParameters = relaunch_flags.c_str();
 
   AtlTrace(L"Relaunching Chrome via shortcut [%ls]\n", sei.lpFile);
 
   if (!::ShellExecuteExW(&sei)) {
     int error = HRESULT_FROM_WIN32(::GetLastError());
@@ skipping 21 matching lines @@
       case DelegateExecuteOperation::RELAUNCH_CHROME:
         ret_code = RelaunchChrome(operation);
         break;
       default:
         NOTREACHED();
     }
   }
   AtlTrace("delegate_execute exit, code = %d\n", ret_code);
   return ret_code;
 }