Add base:: namespace to string16s in chromeos/.

R=satorux@chromium.org
BUG=329295

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

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

7 files changed, 23 insertions, 21 deletions

diff --git a/chromeos/ime/fake_input_method_delegate.cc b/chromeos/ime/fake_input_method_delegate.cc
index b364260..2757750 100644
--- a/chromeos/ime/fake_input_method_delegate.cc
+++ b/chromeos/ime/fake_input_method_delegate.cc
@@ -18,17 +18,18 @@ std::string FakeInputMethodDelegate::GetHardwareKeyboardLayout() const {
   return hardware_keyboard_layout_;
 }
 
-string16 FakeInputMethodDelegate::GetLocalizedString(int resource_id) const {
+base::string16 FakeInputMethodDelegate::GetLocalizedString(
+    int resource_id) const {
   if (!get_localized_string_callback_.is_null())
     return get_localized_string_callback_.Run(resource_id);
-  return string16();
+  return base::string16();
 }
 
-string16 FakeInputMethodDelegate::GetDisplayLanguageName(
+base::string16 FakeInputMethodDelegate::GetDisplayLanguageName(
     const std::string& language_code) const {
   if (!get_display_language_name_callback_.is_null())
     return get_display_language_name_callback_.Run(language_code);
-  return string16();
+  return base::string16();
 }
 
 }  // namespace input_method
diff --git a/chromeos/ime/fake_input_method_delegate.h b/chromeos/ime/fake_input_method_delegate.h
index c6c300e..4f1a100 100644
--- a/chromeos/ime/fake_input_method_delegate.h
+++ b/chromeos/ime/fake_input_method_delegate.h
@@ -16,9 +16,9 @@ namespace input_method {
 
 class CHROMEOS_EXPORT FakeInputMethodDelegate : public InputMethodDelegate {
  public:
-  typedef base::Callback<string16 (const std::string& language_code)>
+  typedef base::Callback<base::string16 (const std::string& language_code)>
       LanguageNameLocalizationCallback;
-  typedef base::Callback<string16 (int resource_id)>
+  typedef base::Callback<base::string16 (int resource_id)>
       GetLocalizedStringCallback;
 
   FakeInputMethodDelegate();
@@ -26,8 +26,8 @@ class CHROMEOS_EXPORT FakeInputMethodDelegate : public InputMethodDelegate {
 
   // InputMethodDelegate implementation:
   virtual std::string GetHardwareKeyboardLayout() const OVERRIDE;
-  virtual string16 GetLocalizedString(int resource_id) const OVERRIDE;
-  virtual string16 GetDisplayLanguageName(
+  virtual base::string16 GetLocalizedString(int resource_id) const OVERRIDE;
+  virtual base::string16 GetDisplayLanguageName(
       const std::string& language_code) const OVERRIDE;
 
   void set_hardware_keyboard_layout(const std::string& value) {
diff --git a/chromeos/ime/input_method_delegate.h b/chromeos/ime/input_method_delegate.h
index 04619b1..b732c48 100644
--- a/chromeos/ime/input_method_delegate.h
+++ b/chromeos/ime/input_method_delegate.h
@@ -24,13 +24,13 @@ class InputMethodDelegate {
   virtual std::string GetHardwareKeyboardLayout() const = 0;
 
   // Retrieves localized string for |resource_id|.
-  virtual string16 GetLocalizedString(int resource_id) const = 0;
+  virtual base::string16 GetLocalizedString(int resource_id) const = 0;
 
   // Converts a language code to a language display name, using the
   // current application locale.
   // Examples: "fi"    => "Finnish"
   //           "en-US" => "English (United States)"
-  virtual string16 GetDisplayLanguageName(
+  virtual base::string16 GetDisplayLanguageName(
       const std::string& language_code) const = 0;
 
  private:
diff --git a/chromeos/network/client_cert_resolver_unittest.cc b/chromeos/network/client_cert_resolver_unittest.cc
index beaa096..2844de2 100644
--- a/chromeos/network/client_cert_resolver_unittest.cc
+++ b/chromeos/network/client_cert_resolver_unittest.cc
@@ -113,7 +113,7 @@ class ClientCertResolverTest : public testing::Test {
     ASSERT_EQ(net::OK,
               cert_db->ImportFromPKCS12(crypt_module.get(),
                                         pkcs12_data,
-                                        string16(),
+                                        base::string16(),
                                         false,
                                         &client_cert_list));
     ASSERT_TRUE(!client_cert_list.empty());
diff --git a/chromeos/network/onc/onc_certificate_importer_impl.cc b/chromeos/network/onc/onc_certificate_importer_impl.cc
index 4f55838..4e46626 100644
--- a/chromeos/network/onc/onc_certificate_importer_impl.cc
+++ b/chromeos/network/onc/onc_certificate_importer_impl.cc
@@ -315,7 +315,7 @@ bool CertificateImporterImpl::ParseClientCertificate(
   net::CertificateList imported_certs;
 
   int import_result = cert_database->ImportFromPKCS12(
-      module.get(), decoded_pkcs12, string16(), false, &imported_certs);
+      module.get(), decoded_pkcs12, base::string16(), false, &imported_certs);
   if (import_result != net::OK) {
     ONC_LOG_ERROR(
         base::StringPrintf("Unable to import client certificate (error %s)",
diff --git a/chromeos/settings/timezone_settings.cc b/chromeos/settings/timezone_settings.cc
index 1adcf13..90c501b 100644
--- a/chromeos/settings/timezone_settings.cc
+++ b/chromeos/settings/timezone_settings.cc
@@ -230,8 +230,8 @@ class TimezoneSettingsBaseImpl : public chromeos::system::TimezoneSettings {
 
   // TimezoneSettings implementation:
   virtual const icu::TimeZone& GetTimezone() OVERRIDE;
-  virtual string16 GetCurrentTimezoneID() OVERRIDE;
-  virtual void SetTimezoneFromID(const string16& timezone_id) OVERRIDE;
+  virtual base::string16 GetCurrentTimezoneID() OVERRIDE;
+  virtual void SetTimezoneFromID(const base::string16& timezone_id) OVERRIDE;
   virtual void AddObserver(Observer* observer) OVERRIDE;
   virtual void RemoveObserver(Observer* observer) OVERRIDE;
   virtual const std::vector<icu::TimeZone*>& GetTimezoneList() const OVERRIDE;
@@ -297,11 +297,12 @@ const icu::TimeZone& TimezoneSettingsBaseImpl::GetTimezone() {
   return *timezone_.get();
 }
 
-string16 TimezoneSettingsBaseImpl::GetCurrentTimezoneID() {
+base::string16 TimezoneSettingsBaseImpl::GetCurrentTimezoneID() {
   return chromeos::system::TimezoneSettings::GetTimezoneID(GetTimezone());
 }
 
-void TimezoneSettingsBaseImpl::SetTimezoneFromID(const string16& timezone_id) {
+void TimezoneSettingsBaseImpl::SetTimezoneFromID(
+    const base::string16& timezone_id) {
   scoped_ptr<icu::TimeZone> timezone(icu::TimeZone::createTimeZone(
       icu::UnicodeString(timezone_id.c_str(), timezone_id.size())));
   SetTimezone(*timezone);
@@ -430,10 +431,10 @@ TimezoneSettings* TimezoneSettings::GetInstance() {
 }
 
 // static
-string16 TimezoneSettings::GetTimezoneID(const icu::TimeZone& timezone) {
+base::string16 TimezoneSettings::GetTimezoneID(const icu::TimeZone& timezone) {
   icu::UnicodeString id;
   timezone.getID(id);
-  return string16(id.getBuffer(), id.length());
+  return base::string16(id.getBuffer(), id.length());
 }
 
 }  // namespace system
diff --git a/chromeos/settings/timezone_settings.h b/chromeos/settings/timezone_settings.h
index c0d9555..0fd7b3d 100644
--- a/chromeos/settings/timezone_settings.h
+++ b/chromeos/settings/timezone_settings.h
@@ -29,11 +29,11 @@ class CHROMEOS_EXPORT TimezoneSettings {
 
   // Returns the current timezone as an icu::Timezone object.
   virtual const icu::TimeZone& GetTimezone() = 0;
-  virtual string16 GetCurrentTimezoneID() = 0;
+  virtual base::string16 GetCurrentTimezoneID() = 0;
 
   // Sets the current timezone and notifies all Observers.
   virtual void SetTimezone(const icu::TimeZone& timezone) = 0;
-  virtual void SetTimezoneFromID(const string16& timezone_id) = 0;
+  virtual void SetTimezoneFromID(const base::string16& timezone_id) = 0;
 
   virtual void AddObserver(Observer* observer) = 0;
   virtual void RemoveObserver(Observer* observer) = 0;
@@ -41,7 +41,7 @@ class CHROMEOS_EXPORT TimezoneSettings {
   virtual const std::vector<icu::TimeZone*>& GetTimezoneList() const = 0;
 
   // Gets timezone ID which is also used as timezone pref value.
-  static string16 GetTimezoneID(const icu::TimeZone& timezone);
+  static base::string16 GetTimezoneID(const icu::TimeZone& timezone);
 
  protected:
   virtual ~TimezoneSettings() {}