Replace string16 with base::string16.

chrome/browser/chromeos/locale_change_guard.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/browser/chromeos/locale_change_guard.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "base/bind.h"
@@ skipping 201 matching lines @@
 
 void LocaleChangeGuard::PrepareChangingLocale(
     const std::string& from_locale, const std::string& to_locale) {
   std::string cur_locale = g_browser_process->GetApplicationLocale();
   if (!from_locale.empty())
     from_locale_ = from_locale;
   if (!to_locale.empty())
     to_locale_ = to_locale;
 
   if (!from_locale_.empty() && !to_locale_.empty()) {
-    string16 from = l10n_util::GetDisplayNameForLocale(
+    base::string16 from = l10n_util::GetDisplayNameForLocale(
         from_locale_, cur_locale, true);
-    string16 to = l10n_util::GetDisplayNameForLocale(
+    base::string16 to = l10n_util::GetDisplayNameForLocale(
         to_locale_, cur_locale, true);
 
     title_text_ = l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_SECTION_TITLE_LANGUAGE);
     message_text_ = l10n_util::GetStringFUTF16(
         IDS_LOCALE_CHANGE_MESSAGE, from, to);
     revert_link_text_ = l10n_util::GetStringFUTF16(
         IDS_LOCALE_CHANGE_REVERT_MESSAGE, from);
   }
 }
 
 void LocaleChangeGuard::Delegate::Close(bool by_user) {
   if (by_user)
     master_->AcceptLocaleChange();
 }
 
 std::string LocaleChangeGuard::Delegate::id() const {
   // Arbitrary unique Id.
   return "8c386938-1e3f-11e0-ac7b-18a90520e2e5";
 }
 
 }  // namespace chromeos