Add base:: to string16 in chrome_frame/.

R=grt@chromium.org
BUG=329295

Review URL: https://codereview.chromium.org/113143006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242115 0039d316-1c4b-4281-b951-d872f2087c98

22 files changed, 83 insertions, 85 deletions

diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc
index 2f22fbe..3c3c80a 100644
--- a/chrome_frame/chrome_tab.cc
+++ b/chrome_frame/chrome_tab.cc
@@ -313,13 +313,13 @@ HRESULT RefreshElevationPolicy() {
 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
@@ -591,7 +591,7 @@ const wchar_t* const kMimeHandlerKeyValues[] = {
 // 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())
@@ -612,7 +612,7 @@ bool MimeHandlerKeyIsConfigured(bool for_install, HKEY root_key) {
 }
 
 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())
diff --git a/chrome_frame/find_dialog.cc b/chrome_frame/find_dialog.cc
index 2bbdce7..bf163ab 100644
--- a/chrome_frame/find_dialog.cc
+++ b/chrome_frame/find_dialog.cc
@@ -35,7 +35,7 @@ LRESULT CFFindDialog::OnDestroy(UINT msg, WPARAM wparam, LPARAM lparam,
 
 LRESULT CFFindDialog::OnFind(WORD wNotifyCode, WORD wID, HWND hWndCtl,
                              BOOL& bHandled) {
-  string16 find_text(kMaxFindChars, L'\0');
+  base::string16 find_text(kMaxFindChars, L'\0');
   find_text.resize(GetDlgItemText(IDC_FIND_TEXT, &find_text[0], kMaxFindChars));
 
   // Repeated searches for the same string should move to the next instance.
diff --git a/chrome_frame/find_dialog.h b/chrome_frame/find_dialog.h
index 4adcdf0..27eca8b 100644
--- a/chrome_frame/find_dialog.h
+++ b/chrome_frame/find_dialog.h
@@ -50,7 +50,7 @@ class CFFindDialog : public CDialogImpl<CFFindDialog> {
 
   // Store the text we searched for last to determine whether we are doing a
   // "Find" or a "Find Next".
-  string16 last_find_text_;
+  base::string16 last_find_text_;
 
   // We don't own these, and they must exist at least as long as we do.
   scoped_refptr<ChromeFrameAutomationClient> automation_client_;
diff --git a/chrome_frame/metrics_service.cc b/chrome_frame/metrics_service.cc
index 8ccc1e5..74d3626 100644
--- a/chrome_frame/metrics_service.cc
+++ b/chrome_frame/metrics_service.cc
@@ -311,7 +311,7 @@ const std::string& MetricsService::GetClientID() {
     HRESULT guid_result = CoCreateGuid(&guid);
     DCHECK(SUCCEEDED(guid_result));
 
-    string16 guid_string;
+    base::string16 guid_string;
     int result = StringFromGUID2(guid,
                                  WriteInto(&guid_string, kGUIDSize), kGUIDSize);
     DCHECK(result == kGUIDSize);
diff --git a/chrome_frame/policy_settings.cc b/chrome_frame/policy_settings.cc
index fb8caf6..a3a3256 100644
--- a/chrome_frame/policy_settings.cc
+++ b/chrome_frame/policy_settings.cc
@@ -113,8 +113,7 @@ void PolicySettings::ReadMetadataCheckSettings(
 
   base::win::RegKey config_key;
   DWORD value = SKIP_METADATA_CHECK_NOT_SPECIFIED;
-  string16 settings_value(
-      ASCIIToWide(policy::key::kSkipMetadataCheck));
+  base::string16 settings_value(ASCIIToWide(policy::key::kSkipMetadataCheck));
   for (int i = 0; i < arraysize(kRootKeys); ++i) {
     if ((config_key.Open(kRootKeys[i], policy::kRegistryChromePolicyKey,
                          KEY_READ) == ERROR_SUCCESS) &&
@@ -175,7 +174,7 @@ void PolicySettings::ReadStringSetting(const char* value_name,
 void PolicySettings::ReadBoolSetting(const char* value_name, bool* value) {
   DCHECK(value);
   base::win::RegKey config_key;
-  string16 value_name_str(ASCIIToWide(value_name));
+  base::string16 value_name_str(ASCIIToWide(value_name));
   DWORD dword_value = 0;
   for (int i = 0; i < arraysize(kRootKeys); ++i) {
     if ((config_key.Open(kRootKeys[i], policy::kRegistryChromePolicyKey,
diff --git a/chrome_frame/registry_list_preferences_holder.cc b/chrome_frame/registry_list_preferences_holder.cc
index c540323..d22cb47 100644
--- a/chrome_frame/registry_list_preferences_holder.cc
+++ b/chrome_frame/registry_list_preferences_holder.cc
@@ -13,7 +13,7 @@ RegistryListPreferencesHolder::RegistryListPreferencesHolder() : valid_(false) {
 void RegistryListPreferencesHolder::Init(HKEY hive,
                                          const wchar_t* registry_path,
                                          const wchar_t* list_name) {
-  string16 list_path(registry_path);
+  base::string16 list_path(registry_path);
   list_path += L"\\";
   list_path += list_name;
   base::win::RegistryValueIterator string_list(hive, list_path.c_str());
@@ -23,9 +23,10 @@ void RegistryListPreferencesHolder::Init(HKEY hive,
   valid_ = true;
 }
 
-bool RegistryListPreferencesHolder::ListMatches(const string16& string) const {
+bool RegistryListPreferencesHolder::ListMatches(const base::string16& string)
+    const {
   DCHECK(Valid());
-  std::vector<string16>::const_iterator iter(values_.begin());
+  std::vector<base::string16>::const_iterator iter(values_.begin());
   for (; iter != values_.end(); ++iter) {
     if (MatchPattern(string, *iter))
       return true;
@@ -35,7 +36,7 @@ bool RegistryListPreferencesHolder::ListMatches(const string16& string) const {
 }
 
 void RegistryListPreferencesHolder::AddStringForTesting(
-    const string16& string) {
+    const base::string16& string) {
   values_.push_back(string);
 }
 
diff --git a/chrome_frame/registry_list_preferences_holder.h b/chrome_frame/registry_list_preferences_holder.h
index c57c462..ec054c2 100644
--- a/chrome_frame/registry_list_preferences_holder.h
+++ b/chrome_frame/registry_list_preferences_holder.h
@@ -30,10 +30,10 @@ class RegistryListPreferencesHolder {
 
   // Returns true iff |string| matches any of the strings in values_, using the
   // matching logic in base's MatchPattern().
-  bool ListMatches(const string16& string) const;
+  bool ListMatches(const base::string16& string) const;
 
   // Manually add a string to values_ for testing purposes.
-  void AddStringForTesting(const string16& string);
+  void AddStringForTesting(const base::string16& string);
 
   // Reset the holder causing it to be re-initialized, for testing purposes
   // only.
@@ -41,7 +41,7 @@ class RegistryListPreferencesHolder {
   void ResetForTesting();
 
  private:
-  std::vector<string16> values_;
+  std::vector<base::string16> values_;
   bool valid_;
 
   DISALLOW_COPY_AND_ASSIGN(RegistryListPreferencesHolder);
diff --git a/chrome_frame/simple_resource_loader.cc b/chrome_frame/simple_resource_loader.cc
index e6d5c6c..ad38fee 100644
--- a/chrome_frame/simple_resource_loader.cc
+++ b/chrome_frame/simple_resource_loader.cc
@@ -245,10 +245,10 @@ std::wstring SimpleResourceLoader::GetLocalizedResource(int message_id) {
   }
 
   // Data pack encodes strings as either UTF8 or UTF16.
-  string16 msg;
+  base::string16 msg;
   if (data_pack_->GetTextEncodingType() == ui::DataPack::UTF16) {
-    msg = string16(reinterpret_cast<const char16*>(data.data()),
-                   data.length() / 2);
+    msg = base::string16(reinterpret_cast<const char16*>(data.data()),
+                         data.length() / 2);
   } else if (data_pack_->GetTextEncodingType() == ui::DataPack::UTF8) {
     msg = UTF8ToUTF16(data);
   }
diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc
index 8dfc86e..df912de2 100644
--- a/chrome_frame/test/chrome_frame_test_utils.cc
+++ b/chrome_frame/test/chrome_frame_test_utils.cc
@@ -512,7 +512,7 @@ base::FilePath GetSeleniumTestFolder() {
 }
 
 std::wstring GetPathFromUrl(const std::wstring& url) {
-  string16 url16 = WideToUTF16(url);
+  base::string16 url16 = WideToUTF16(url);
   GURL gurl = GURL(url16);
   if (gurl.has_query()) {
     GURL::Replacements replacements;
@@ -523,13 +523,13 @@ std::wstring GetPathFromUrl(const std::wstring& url) {
 }
 
 std::wstring GetPathAndQueryFromUrl(const std::wstring& url) {
-  string16 url16 = WideToUTF16(url);
+  base::string16 url16 = WideToUTF16(url);
   GURL gurl = GURL(url16);
   return UTF8ToWide(gurl.PathForRequest());
 }
 
 std::wstring GetClipboardText() {
-  string16 text16;
+  base::string16 text16;
   ui::Clipboard::GetForCurrentThread()->ReadText(
       ui::CLIPBOARD_TYPE_COPY_PASTE, &text16);
   return UTF16ToWide(text16);
diff --git a/chrome_frame/test/delete_chrome_history_test.cc b/chrome_frame/test/delete_chrome_history_test.cc
index 32056ca..119aac4 100644
--- a/chrome_frame/test/delete_chrome_history_test.cc
+++ b/chrome_frame/test/delete_chrome_history_test.cc
@@ -109,7 +109,7 @@ ACTION_P2(ExpectFormValuesForElementNameMatch, element_name, matcher) {
   EXPECT_EQ(sql::INIT_OK, init_status);
 
   if (init_status == sql::INIT_OK) {
-    std::vector<string16> values;
+    std::vector<base::string16> values;
     autofill_table.GetFormValuesForElementName(
         element_name, L"", &values, 9999);
     EXPECT_THAT(values, matcher);
diff --git a/chrome_frame/test/http_negotiate_unittest.cc b/chrome_frame/test/http_negotiate_unittest.cc
index a21e4e8..c61491d 100644
--- a/chrome_frame/test/http_negotiate_unittest.cc
+++ b/chrome_frame/test/http_negotiate_unittest.cc
@@ -67,17 +67,16 @@ TEST_F(HttpNegotiateTest, BeginningTransaction) {
               static_cast<IHttpNegotiate*>(
                   &test_http)))[kBeginningTransactionIndex]);
 
-  string16 cf_ua(
+  base::string16 cf_ua(
       ASCIIToWide(http_utils::GetDefaultUserAgentHeaderWithCFTag()));
-  string16 cf_tag(
-      ASCIIToWide(http_utils::GetChromeFrameUserAgent()));
+  base::string16 cf_tag(ASCIIToWide(http_utils::GetChromeFrameUserAgent()));
 
-  EXPECT_NE(string16::npos, cf_ua.find(L"chromeframe/"));
+  EXPECT_NE(base::string16::npos, cf_ua.find(L"chromeframe/"));
 
   struct TestCase {
-    const string16 original_headers_;
-    const string16 delegate_additional_;
-    const string16 expected_additional_;
+    const base::string16 original_headers_;
+    const base::string16 delegate_additional_;
+    const base::string16 expected_additional_;
     HRESULT delegate_return_value_;
   } test_cases[] = {
     { L"Accept: */*\r\n",
@@ -118,7 +117,7 @@ TEST_F(HttpNegotiateTest, BeginningTransaction) {
 
     if (additional) {
       // Check against the expected additional headers.
-      EXPECT_EQ(test.expected_additional_, string16(additional));
+      EXPECT_EQ(test.expected_additional_, base::string16(additional));
       ::CoTaskMemFree(additional);
     }
   }
@@ -133,28 +132,27 @@ TEST_F(HttpNegotiateTest, BeginningTransactionUARemoval) {
               static_cast<IHttpNegotiate*>(
                   &test_http)))[kBeginningTransactionIndex]);
 
-  string16 nocf_ua(
+  base::string16 nocf_ua(
       ASCIIToWide(http_utils::RemoveChromeFrameFromUserAgentValue(
           http_utils::GetDefaultUserAgentHeaderWithCFTag())));
-  string16 cf_ua(
-      ASCIIToWide(http_utils::AddChromeFrameToUserAgentValue(
-          WideToASCII(nocf_ua))));
+  base::string16 cf_ua(ASCIIToWide(
+      http_utils::AddChromeFrameToUserAgentValue(WideToASCII(nocf_ua))));
 
-  EXPECT_EQ(string16::npos, nocf_ua.find(L"chromeframe/"));
-  EXPECT_NE(string16::npos, cf_ua.find(L"chromeframe/"));
+  EXPECT_EQ(base::string16::npos, nocf_ua.find(L"chromeframe/"));
+  EXPECT_NE(base::string16::npos, cf_ua.find(L"chromeframe/"));
 
-  string16 ua_url(L"www.withua.com");
-  string16 no_ua_url(L"www.noua.com");
+  base::string16 ua_url(L"www.withua.com");
+  base::string16 no_ua_url(L"www.noua.com");
 
   RegistryListPreferencesHolder& ua_holder =
       GetUserAgentPreferencesHolderForTesting();
   ua_holder.AddStringForTesting(no_ua_url);
 
   struct TestCase {
-    const string16 url_;
-    const string16 original_headers_;
-    const string16 delegate_additional_;
-    const string16 expected_additional_;
+    const base::string16 url_;
+    const base::string16 original_headers_;
+    const base::string16 delegate_additional_;
+    const base::string16 expected_additional_;
   } test_cases[] = {
     { ua_url,
       L"",
@@ -186,7 +184,7 @@ TEST_F(HttpNegotiateTest, BeginningTransactionUARemoval) {
 
     if (additional) {
       // Check against the expected additional headers.
-      EXPECT_EQ(test.expected_additional_, string16(additional))
+      EXPECT_EQ(test.expected_additional_, base::string16(additional))
           << "Iteration: " << i;
       ::CoTaskMemFree(additional);
     }
@@ -247,13 +245,13 @@ END_COM_MAP()
     return status_;
   }
 
-  const string16& last_status_text() const {
+  const base::string16& last_status_text() const {
     return status_text_;
   }
 
  protected:
   ULONG status_;
-  string16 status_text_;
+  base::string16 status_text_;
   base::win::ScopedComPtr<IWebBrowser2> browser_;
 };
 
diff --git a/chrome_frame/test/ie_configurator.cc b/chrome_frame/test/ie_configurator.cc
index 8f30c30..78d8711 100644
--- a/chrome_frame/test/ie_configurator.cc
+++ b/chrome_frame/test/ie_configurator.cc
@@ -184,7 +184,7 @@ class ModernIEConfigurator : public IEConfigurator {
 
   static const RunOnceValueNames* RunOnceNamesForVersion(IEVersion ie_version);
   bool IsPerUserSetupComplete();
-  static string16 GetChromeFrameBHOCLSID();
+  static base::string16 GetChromeFrameBHOCLSID();
   static bool IsAddonPromptDisabledForChromeFrame();
 
   const IEVersion ie_version_;
@@ -462,8 +462,8 @@ bool ModernIEConfigurator::IsPerUserSetupComplete() {
 
 // Returns the path to the IE9 Approved Extensions key for Chrome Frame.
 // static
-string16 ModernIEConfigurator::GetChromeFrameBHOCLSID() {
-  string16 bho_guid(39, L'\0');
+base::string16 ModernIEConfigurator::GetChromeFrameBHOCLSID() {
+  base::string16 bho_guid(39, L'\0');
   int guid_len = StringFromGUID2(CLSID_ChromeFrameBHO, &bho_guid[0],
                                  bho_guid.size());
   DCHECK_EQ(guid_len, static_cast<int>(bho_guid.size()));
diff --git a/chrome_frame/test/mock_ie_event_sink_actions.h b/chrome_frame/test/mock_ie_event_sink_actions.h
index 9aa57a1..ff13a7f 100644
--- a/chrome_frame/test/mock_ie_event_sink_actions.h
+++ b/chrome_frame/test/mock_ie_event_sink_actions.h
@@ -43,15 +43,15 @@ MATCHER_P(AccSatisfies, matcher, "satisfies the given AccObjectMatcher") {
 // |arg|. Both url and title are matched to account for a race between the test
 // and Chrome when the window title is transitioned from the url to the title.
 MATCHER_P2(TabContentsTitleEq, the_url, the_title, "") {
-  const string16 url(the_url);
+  const base::string16 url(the_url);
   DCHECK(!url.empty());
-  const string16 title(the_title);
+  const base::string16 title(the_title);
   DCHECK(!title.empty());
   HWND parent = GetParent(arg);
   if (parent != NULL) {
-    string16 parent_title(255, L'\0');
+    base::string16 parent_title(255, L'\0');
     std::ostringstream titles_found(std::string("titles found: "));
-    string16 first_title;
+    base::string16 first_title;
     do {
       parent_title.resize(255, L'\0');
       parent_title.resize(GetWindowText(parent, &parent_title[0],
diff --git a/chrome_frame/test/test_scrubber.cc b/chrome_frame/test/test_scrubber.cc
index 8881a8b..64dbdce 100644
--- a/chrome_frame/test/test_scrubber.cc
+++ b/chrome_frame/test/test_scrubber.cc
@@ -74,8 +74,8 @@ class TestScrubber {
 
   bool is_initialized() const { return !default_data_directory_.empty(); }
 
-  string16 default_data_directory_;
-  string16 data_directory_override_;
+  base::string16 default_data_directory_;
+  base::string16 data_directory_override_;
 
   DISALLOW_COPY_AND_ASSIGN(TestScrubber);
 };
diff --git a/chrome_frame/test/ui_test.cc b/chrome_frame/test/ui_test.cc
index faab2a2..6ea0d17 100644
--- a/chrome_frame/test/ui_test.cc
+++ b/chrome_frame/test/ui_test.cc
@@ -484,7 +484,7 @@ class ContextMenuTest : public MockIEEventSinkTest, public testing::Test {
     InSequence expect_in_sequence_for_scope;
 
     // Open 'Save As' dialog.
-    string16 initial_url(GetTestUrl(L"save_as_context_menu.html"));
+    base::string16 initial_url(GetTestUrl(L"save_as_context_menu.html"));
     const char* kSaveDlgCaption = "Save As";
     EXPECT_CALL(acc_observer_,
                 OnAccDocLoad(TabContentsTitleEq(initial_url,
@@ -532,7 +532,7 @@ TEST_F(ContextMenuTest, CFReload) {
   server_mock_.ExpectAndServeAnyRequests(CFInvocation::MetaTag());
   InSequence expect_in_sequence_for_scope;
 
-  string16 initial_url(GetSimplePageUrl());
+  base::string16 initial_url(GetSimplePageUrl());
   EXPECT_CALL(acc_observer_,
               OnAccDocLoad(TabContentsTitleEq(initial_url,
                                               GetSimplePageTitle())))
@@ -559,7 +559,7 @@ TEST_F(ContextMenuTest, CFViewSource) {
   MockIEEventSink view_source_mock;
   view_source_mock.ExpectAnyNavigations();
   InSequence expect_in_sequence_for_scope;
-  string16 initial_url(GetSimplePageUrl());
+  base::string16 initial_url(GetSimplePageUrl());
 
   // View the page source.
   EXPECT_CALL(acc_observer_,
@@ -597,7 +597,7 @@ TEST_F(ContextMenuTest, DISABLED_CFPageInfo) {
   server_mock_.ExpectAndServeAnyRequests(CFInvocation::MetaTag());
   MockWindowObserver win_observer_mock;
   InSequence expect_in_sequence_for_scope;
-  string16 initial_url(GetSimplePageUrl());
+  base::string16 initial_url(GetSimplePageUrl());
 
   // View page information.
   EXPECT_CALL(acc_observer_,
@@ -630,7 +630,7 @@ TEST_F(ContextMenuTest, CFInspector) {
   // Devtools begins life with "Untitled" caption and it changes
   // later to the 'Developer Tools - <url> form.
   const char* kPageInfoCaptionPattern = "Untitled*";
-  string16 initial_url(GetSimplePageUrl());
+  base::string16 initial_url(GetSimplePageUrl());
   EXPECT_CALL(acc_observer_,
               OnAccDocLoad(TabContentsTitleEq(initial_url,
                                               GetSimplePageTitle())))
@@ -688,7 +688,7 @@ TEST_F(ContextMenuTest, CFAboutVersionLoads) {
   MockIEEventSink new_window_mock;
   new_window_mock.ExpectAnyNavigations();
   InSequence expect_in_sequence_for_scope;
-  string16 initial_url(GetSimplePageUrl());
+  base::string16 initial_url(GetSimplePageUrl());
 
   EXPECT_CALL(acc_observer_,
               OnAccDocLoad(TabContentsTitleEq(initial_url,
@@ -717,7 +717,7 @@ TEST_F(ContextMenuTest, CFAboutVersionLoads) {
 TEST_F(ContextMenuTest, IEOpen) {
   server_mock_.ExpectAndServeAnyRequests(CFInvocation::None());
   InSequence expect_in_sequence_for_scope;
-  string16 initial_url(GetLinkPageUrl());
+  base::string16 initial_url(GetLinkPageUrl());
 
   // Open the link through the context menu.
   EXPECT_CALL(acc_observer_,
@@ -744,7 +744,7 @@ TEST_F(ContextMenuTest, IEOpenInNewWindow) {
   MockIEEventSink new_window_mock;
   new_window_mock.ExpectAnyNavigations();
   InSequence expect_in_sequence_for_scope;
-  string16 initial_url(GetLinkPageUrl());
+  base::string16 initial_url(GetLinkPageUrl());
 
   // Open the link in a new window.
   EXPECT_CALL(acc_observer_,
@@ -807,7 +807,7 @@ TEST_F(ContextMenuTest, DISABLED_CFOpenLinkInNewWindow) {
   server_mock_.ExpectAndServeAnyRequests(CFInvocation::MetaTag());
   MockIEEventSink new_window_mock;
   new_window_mock.ExpectAnyNavigations();
-  string16 initial_url(GetLinkPageUrl());
+  base::string16 initial_url(GetLinkPageUrl());
 
   // Invoke 'Open link in new window' context menu item.
   EXPECT_CALL(acc_observer_,
@@ -830,7 +830,7 @@ TEST_F(ContextMenuTest, DISABLED_CFOpenLinkInNewWindow) {
 // Test CF link context menu - Copy link address.
 TEST_F(ContextMenuTest, CFCopyLinkAddress) {
   server_mock_.ExpectAndServeAnyRequests(CFInvocation::MetaTag());
-  string16 initial_url(GetLinkPageUrl());
+  base::string16 initial_url(GetLinkPageUrl());
 
   // Invoke 'Copy link address' context menu item.
   EXPECT_CALL(acc_observer_,
diff --git a/chrome_frame/test_utils.cc b/chrome_frame/test_utils.cc
index b8884e7..4661bf8 100644
--- a/chrome_frame/test_utils.cc
+++ b/chrome_frame/test_utils.cc
@@ -71,7 +71,7 @@ void ScopedChromeFrameRegistrar::RegisterDefaults() {
 // information.
 // static
 void ScopedChromeFrameRegistrar::DoRegistration(
-    const string16& path,
+    const base::string16& path,
     RegistrationType registration_type,
     RegistrationOperation registration_operation) {
   static const char* const kEntrypoints[] = {
@@ -95,7 +95,7 @@ void ScopedChromeFrameRegistrar::DoRegistration(
     entrypoint_index += 2;
   if (registration_operation == UNREGISTER)
     entrypoint_index += 1;
-  string16 registration_command(ASCIIToUTF16("\""));
+  base::string16 registration_command(ASCIIToUTF16("\""));
   registration_command +=
       CommandLine::ForCurrentProcess()->GetProgram().value();
   registration_command += ASCIIToUTF16("\" ");
diff --git a/chrome_frame/test_utils.h b/chrome_frame/test_utils.h
index 804f069..a6852f3 100644
--- a/chrome_frame/test_utils.h
+++ b/chrome_frame/test_utils.h
@@ -71,7 +71,7 @@ class ScopedChromeFrameRegistrar {
   // The string "--call-registration-entrypoint".
   static const wchar_t kCallRegistrationEntrypointSwitch[];
 
-  static void DoRegistration(const string16& path,
+  static void DoRegistration(const base::string16& path,
                              RegistrationType registration_type,
                              RegistrationOperation registration_operation);
 
diff --git a/chrome_frame/turndown_prompt/turndown_prompt.cc b/chrome_frame/turndown_prompt/turndown_prompt.cc
index 40c16e5..19d69dd 100644
--- a/chrome_frame/turndown_prompt/turndown_prompt.cc
+++ b/chrome_frame/turndown_prompt/turndown_prompt.cc
@@ -43,9 +43,9 @@ class BrowserObserver : public ReadyModeWebBrowserAdapter::Observer {
                   ReadyModeWebBrowserAdapter* adapter);
 
   // ReadyModeWebBrowserAdapter::Observer implementation
-  virtual void OnNavigateTo(const string16& url);
-  virtual void OnRenderInChromeFrame(const string16& url);
-  virtual void OnRenderInHost(const string16& url);
+  virtual void OnNavigateTo(const base::string16& url);
+  virtual void OnRenderInChromeFrame(const base::string16& url);
+  virtual void OnRenderInHost(const base::string16& url);
 
  private:
   // Shows the turndown prompt.
@@ -69,7 +69,7 @@ class UrlLauncherImpl : public UrlLauncher {
   explicit UrlLauncherImpl(IWebBrowser2* web_browser);
 
   // UrlLauncher implementation
-  void LaunchUrl(const string16& url);
+  void LaunchUrl(const base::string16& url);
 
  private:
   base::win::ScopedComPtr<IWebBrowser2> web_browser_;
@@ -80,7 +80,7 @@ UrlLauncherImpl::UrlLauncherImpl(IWebBrowser2* web_browser) {
   web_browser_ = web_browser;
 }
 
-void UrlLauncherImpl::LaunchUrl(const string16& url) {
+void UrlLauncherImpl::LaunchUrl(const base::string16& url) {
   VARIANT flags = { VT_I4 };
   V_I4(&flags) = navOpenInNewWindow;
   base::win::ScopedBstr location(url.c_str());
@@ -96,7 +96,7 @@ BrowserObserver::BrowserObserver(IWebBrowser2* web_browser,
       adapter_(adapter) {
 }
 
-void BrowserObserver::OnNavigateTo(const string16& url) {
+void BrowserObserver::OnNavigateTo(const base::string16& url) {
   if (!net::registry_controlled_domains::SameDomainOrHost(
           GURL(url),
           rendered_url_,
@@ -106,12 +106,12 @@ void BrowserObserver::OnNavigateTo(const string16& url) {
   }
 }
 
-void BrowserObserver::OnRenderInChromeFrame(const string16& url) {
+void BrowserObserver::OnRenderInChromeFrame(const base::string16& url) {
   ShowPrompt();
   rendered_url_ = GURL(url);
 }
 
-void BrowserObserver::OnRenderInHost(const string16& url) {
+void BrowserObserver::OnRenderInHost(const base::string16& url) {
   Hide();
   rendered_url_ = GURL(url);
 }
diff --git a/chrome_frame/turndown_prompt/turndown_prompt_window.cc b/chrome_frame/turndown_prompt/turndown_prompt_window.cc
index d2174da..e0da6f3 100644
--- a/chrome_frame/turndown_prompt/turndown_prompt_window.cc
+++ b/chrome_frame/turndown_prompt/turndown_prompt_window.cc
@@ -51,7 +51,7 @@ base::WeakPtr<TurndownPromptWindow> TurndownPromptWindow::CreateInstance(
 
   // Substitute the proper text given the current IE version.
   CWindow text = instance->GetDlgItem(IDC_TD_PROMPT_MESSAGE);
-  string16 prompt_text(GetPromptText());
+  base::string16 prompt_text(GetPromptText());
   if (!prompt_text.empty())
     text.SetWindowText(prompt_text.c_str());
 
@@ -102,7 +102,7 @@ LRESULT TurndownPromptWindow::OnUninstall(WORD /*wNotifyCode*/,
 }
 
 // static
-string16 TurndownPromptWindow::GetPromptText() {
+base::string16 TurndownPromptWindow::GetPromptText() {
   IEVersion ie_version = GetIEVersion();
   int message_id = IDS_CHROME_FRAME_TURNDOWN_TEXT_IE_NEWER;
   if (ie_version == IE_6 || ie_version == IE_7 || ie_version == IE_8)
diff --git a/chrome_frame/turndown_prompt/turndown_prompt_window.h b/chrome_frame/turndown_prompt/turndown_prompt_window.h
index 61614c7..ed0b741 100644
--- a/chrome_frame/turndown_prompt/turndown_prompt_window.h
+++ b/chrome_frame/turndown_prompt/turndown_prompt_window.h
@@ -91,7 +91,7 @@ class TurndownPromptWindow
                       BOOL& bHandled);
 
   // Returns the prompt text for the current version of IE.
-  static string16 GetPromptText();
+  static base::string16 GetPromptText();
 
   InfobarContent::Frame* frame_;  // Not owned by this instance
   scoped_ptr<WTL::CHyperLink> link_;
diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc
index b0efbe74..46f3f7e 100644
--- a/chrome_frame/utils.cc
+++ b/chrome_frame/utils.cc
@@ -299,7 +299,7 @@ void DisplayVersionMismatchWarning(HWND parent,
   // 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);
@@ -742,7 +742,7 @@ RendererType RendererTypeForUrl(const std::wstring& 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
@@ -1632,7 +1632,7 @@ bool IncreaseWinInetConnections(DWORD connections) {
   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);
diff --git a/chrome_frame/utils.h b/chrome_frame/utils.h
index b399c70..43c85e5 100644
--- a/chrome_frame/utils.h
+++ b/chrome_frame/utils.h
@@ -288,7 +288,7 @@ RendererType RendererTypeForUrl(const std::wstring& url);
 
 // Check if we should try to remove the CF user agent based on registry
 // settings.
-bool ShouldRemoveUAForUrl(const string16& url);
+bool ShouldRemoveUAForUrl(const base::string16& url);
 
 // Testing methods that return the backing stores behind RendererTypeForUrl and
 // ShouldRemoveUAForUrl. Intended to allow unit testing code that calls the
@@ -601,7 +601,7 @@ bool IncreaseWinInetConnections(DWORD connections);
 
 // Sets |profile_path| to the path for the Chrome Frame |profile_name|
 // profile.
-void GetChromeFrameProfilePath(const string16& profile_name,
+void GetChromeFrameProfilePath(const base::string16& profile_name,
                                base::FilePath* profile_path);
 
 #endif  // CHROME_FRAME_UTILS_H_