Add base:: to string16 in chrome_frame/.

chrome_frame/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 "chrome_frame/utils.h"
 
 #include <atlsafe.h>
 #include <atlsecurity.h>
 #include <htiframe.h>
 #include <mshtml.h>
@@ skipping 281 matching lines @@
   }
 
   return E_FAIL;
 }
 
 void DisplayVersionMismatchWarning(HWND parent,
                                    const std::string& server_version) {
   // Obtain the current module version.
   scoped_ptr<FileVersionInfo> module_version_info(
       FileVersionInfo::CreateFileVersionInfoForCurrentModule());
-  string16 version_string(module_version_info->file_version());
+  base::string16 version_string(module_version_info->file_version());
   std::wstring wide_server_version;
   if (server_version.empty()) {
     wide_server_version = SimpleResourceLoader::Get(IDS_VERSIONUNKNOWN);
   } else {
     wide_server_version = ASCIIToWide(server_version);
   }
   std::wstring title = SimpleResourceLoader::Get(IDS_VERSIONMISMATCH_HEADER);
   std::wstring message;
   base::SStringPrintf(&message,
                       SimpleResourceLoader::Get(IDS_VERSIONMISMATCH).c_str(),
@@ skipping 422 matching lines @@
 
   if (render_type_for_url_holder.ListMatches(url)) {
     renderer_type = render_in_cf_by_default ?
       RENDERER_TYPE_UNDETERMINED :
       RENDERER_TYPE_CHROME_OPT_IN_URL;
   }
 
   return renderer_type;
 }
 
-bool ShouldRemoveUAForUrl(const string16& url) {
+bool ShouldRemoveUAForUrl(const base::string16& url) {
   // TODO(robertshield): Wire up the stuff in PolicySettings here so the value
   // can be specified via group policy.
   // TODO(robertshield): Add a default list of exclusions here for site with
   // known bad UA parsing.
   RegistryListPreferencesHolder& user_agent_filter_holder =
       g_user_agent_filter_holder.Get();
   if (!user_agent_filter_holder.Valid()) {
     user_agent_filter_holder.Init(HKEY_CURRENT_USER,
                                   kChromeFrameConfigKey,
                                   kExcludeUAFromDomainList);
@@ skipping 869 matching lines @@
     ret = InternetSetOption(NULL, connection_options[option_index],
                             &connections, connection_value_size);
     if (!ret) {
       return false;
     }
   }
   wininet_connection_count_updated = true;
   return true;
 }
 
-void GetChromeFrameProfilePath(const string16& profile_name,
+void GetChromeFrameProfilePath(const base::string16& profile_name,
                                base::FilePath* profile_path) {
   chrome::GetChromeFrameUserDataDirectory(profile_path);
   *profile_path = profile_path->Append(profile_name);
   DVLOG(1) << __FUNCTION__ << ": " << profile_path->value();
 }