Add base:: to string16 in chrome_frame/.

chrome_frame/chrome_tab.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.
 
 // chrome_tab.cc : Implementation of DLL Exports.
 
 // Need to include this before the ATL headers below.
 #include "chrome_frame/chrome_tab.h"
 
 #include <atlsecurity.h>
@@ skipping 295 matching lines @@
 // - Overall the time saved will always be less than total time spent
 //  paging in chrome
 // - We are not sure when the chrome 'warm up' will age out from the
 //  boot prefetch file.
 //
 // The idea here is to try this out on chrome frame dev channel
 // and see if it produces a significant drift in startup numbers.
 HRESULT SetupRunOnce() {
   HRESULT result = E_FAIL;
 
-  string16 channel_name;
+  base::string16 channel_name;
   if (base::win::GetVersion() < base::win::VERSION_VISTA &&
       GoogleUpdateSettings::GetChromeChannelAndModifiers(true, &channel_name)) {
     std::transform(channel_name.begin(), channel_name.end(),
                    channel_name.begin(), tolower);
     // Use this only for the dev channel.
-    if (channel_name.find(L"dev") != string16::npos) {
+    if (channel_name.find(L"dev") != base::string16::npos) {
       HKEY hive = HKEY_CURRENT_USER;
       if (IsSystemProcess()) {
         // For system installs, our updates will be running as SYSTEM which
         // makes writing to a RunOnce key under HKCU not so terribly useful.
         hive = HKEY_LOCAL_MACHINE;
       }
 
       RegKey run_once;
       LONG ret = run_once.Create(hive, kRunOnce, KEY_READ | KEY_WRITE);
       if (ret == ERROR_SUCCESS) {
@@ skipping 251 matching lines @@
 
 const wchar_t* const kMimeHandlerKeyValues[] = {
   L"ChromeTab.ChromeActiveDocument",
   L"ChromeTab.ChromeActiveDocument.1",
 };
 
 // Returns true if the values are present or absent in |root_key|'s Secure Mime
 // Handlers key based on |for_installed|. Returns false if the values are not as
 // expected or if an error occurred.
 bool MimeHandlerKeyIsConfigured(bool for_install, HKEY root_key) {
-  string16 key_name(kInternetSettings);
+  base::string16 key_name(kInternetSettings);
   key_name.append(L"\\Secure Mime Handlers");
   RegKey key(root_key, key_name.c_str(), KEY_QUERY_VALUE);
   if (!key.Valid())
     return false;
 
   for (size_t i = 0; i < arraysize(kMimeHandlerKeyValues); ++i) {
     DWORD value = 0;
     LONG result = key.ReadValueDW(kMimeHandlerKeyValues[i], &value);
     if (for_install) {
       if (result != ERROR_SUCCESS || value != 1)
         return false;
     } else {
       if (result != ERROR_FILE_NOT_FOUND)
         return false;
     }
   }
   return true;
 }
 
 HRESULT SetOrDeleteMimeHandlerKey(bool set, HKEY root_key) {
-  string16 key_name(kInternetSettings);
+  base::string16 key_name(kInternetSettings);
   key_name.append(L"\\Secure Mime Handlers");
   RegKey key(root_key, key_name.c_str(), KEY_SET_VALUE);
   if (!key.Valid())
     return false;
 
   HRESULT result = S_OK;
   for (size_t i = 0; i < arraysize(kMimeHandlerKeyValues); ++i) {
     LONG intermediate = set ?
         key.WriteValue(kMimeHandlerKeyValues[i], 1) :
         key.DeleteValue(kMimeHandlerKeyValues[i]);
@@ skipping 401 matching lines @@
   HRESULT hr = CustomRegistration(ALL, FALSE, false);
   return hr;
 }
 
 // Object entries go here instead of with each object, so that we can move
 // the objects to a lib. Also reduces magic.
 OBJECT_ENTRY_AUTO(CLSID_ChromeFrameBHO, Bho)
 OBJECT_ENTRY_AUTO(__uuidof(ChromeActiveDocument), ChromeActiveDocument)
 OBJECT_ENTRY_AUTO(__uuidof(ChromeFrame), ChromeFrameActivex)
 OBJECT_ENTRY_AUTO(__uuidof(ChromeProtocol), ChromeProtocol)