Replace string16 with base::string16.

chrome/browser/chromeos/options/wifi_config_view.cc

Index: chrome/browser/chromeos/options/wifi_config_view.cc
diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc
index 19cfbbcf86a6c644b0016f1f52f6abfd2f69ccfa..c1b6d594a249d242643611b7f592743656781d78 100644
--- a/chrome/browser/chromeos/options/wifi_config_view.cc
+++ b/chrome/browser/chromeos/options/wifi_config_view.cc
@@ -106,7 +106,7 @@ class SecurityComboboxModel : public ui::ComboboxModel {
 
   // Overridden from ui::ComboboxModel:
   virtual int GetItemCount() const OVERRIDE;
-  virtual string16 GetItemAt(int index) OVERRIDE;
+  virtual base::string16 GetItemAt(int index) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SecurityComboboxModel);
@@ -119,7 +119,7 @@ class EAPMethodComboboxModel : public ui::ComboboxModel {
 
   // Overridden from ui::ComboboxModel:
   virtual int GetItemCount() const OVERRIDE;
-  virtual string16 GetItemAt(int index) OVERRIDE;
+  virtual base::string16 GetItemAt(int index) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(EAPMethodComboboxModel);
@@ -132,7 +132,7 @@ class Phase2AuthComboboxModel : public ui::ComboboxModel {
 
   // Overridden from ui::ComboboxModel:
   virtual int GetItemCount() const OVERRIDE;
-  virtual string16 GetItemAt(int index) OVERRIDE;
+  virtual base::string16 GetItemAt(int index) OVERRIDE;
 
  private:
   views::Combobox* eap_method_combobox_;
@@ -147,7 +147,7 @@ class ServerCACertComboboxModel : public ui::ComboboxModel {
 
   // Overridden from ui::ComboboxModel:
   virtual int GetItemCount() const OVERRIDE;
-  virtual string16 GetItemAt(int index) OVERRIDE;
+  virtual base::string16 GetItemAt(int index) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ServerCACertComboboxModel);
@@ -160,7 +160,7 @@ class UserCertComboboxModel : public ui::ComboboxModel {
 
   // Overridden from ui::ComboboxModel:
   virtual int GetItemCount() const OVERRIDE;
-  virtual string16 GetItemAt(int index) OVERRIDE;
+  virtual base::string16 GetItemAt(int index) OVERRIDE;
 
  private:
   WifiConfigView* owner_;
@@ -179,7 +179,7 @@ SecurityComboboxModel::~SecurityComboboxModel() {
 int SecurityComboboxModel::GetItemCount() const {
     return SECURITY_INDEX_COUNT;
   }
-string16 SecurityComboboxModel::GetItemAt(int index) {
+base::string16 SecurityComboboxModel::GetItemAt(int index) {
   if (index == SECURITY_INDEX_NONE)
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_NONE);
@@ -190,7 +190,7 @@ string16 SecurityComboboxModel::GetItemAt(int index) {
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_PSK);
   NOTREACHED();
-  return string16();
+  return base::string16();
 }
 
 // EAPMethodComboboxModel ------------------------------------------------------
@@ -204,7 +204,7 @@ EAPMethodComboboxModel::~EAPMethodComboboxModel() {
 int EAPMethodComboboxModel::GetItemCount() const {
   return EAP_METHOD_INDEX_COUNT;
 }
-string16 EAPMethodComboboxModel::GetItemAt(int index) {
+base::string16 EAPMethodComboboxModel::GetItemAt(int index) {
   if (index == EAP_METHOD_INDEX_NONE)
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_EAP_METHOD_NONE);
@@ -221,7 +221,7 @@ string16 EAPMethodComboboxModel::GetItemAt(int index) {
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_EAP_METHOD_TTLS);
   NOTREACHED();
-  return string16();
+  return base::string16();
 }
 
 // Phase2AuthComboboxModel -----------------------------------------------------
@@ -249,7 +249,7 @@ int Phase2AuthComboboxModel::GetItemCount() const {
   return 0;
 }
 
-string16 Phase2AuthComboboxModel::GetItemAt(int index) {
+base::string16 Phase2AuthComboboxModel::GetItemAt(int index) {
   if (index == PHASE_2_AUTH_INDEX_AUTO)
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PHASE_2_AUTH_AUTO);
@@ -269,7 +269,7 @@ string16 Phase2AuthComboboxModel::GetItemAt(int index) {
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PHASE_2_AUTH_CHAP);
   NOTREACHED();
-  return string16();
+  return base::string16();
 }
 
 // ServerCACertComboboxModel ---------------------------------------------------
@@ -288,7 +288,7 @@ int ServerCACertComboboxModel::GetItemCount() const {
       CertLibrary::CERT_TYPE_SERVER_CA) + 2;
 }
 
-string16 ServerCACertComboboxModel::GetItemAt(int index) {
+base::string16 ServerCACertComboboxModel::GetItemAt(int index) {
   if (CertLibrary::Get()->CertificatesLoading())
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_LOADING);
@@ -324,9 +324,9 @@ int UserCertComboboxModel::GetItemCount() const {
   return num_certs;
 }
 
-string16 UserCertComboboxModel::GetItemAt(int index) {
+base::string16 UserCertComboboxModel::GetItemAt(int index) {
   if (!owner_->UserCertActive())
-    return string16();
+    return base::string16();
   if (CertLibrary::Get()->CertificatesLoading())
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_LOADING);
@@ -379,7 +379,7 @@ WifiConfigView::~WifiConfigView() {
   CertLibrary::Get()->RemoveObserver(this);
 }
 
-string16 WifiConfigView::GetTitle() const {
+base::string16 WifiConfigView::GetTitle() const {
   return l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_JOIN_WIFI_NETWORKS);
 }
 
@@ -497,7 +497,7 @@ void WifiConfigView::RefreshEapFields() {
                                     passphrase_ui_data_.IsEditable());
   passphrase_label_->SetEnabled(passphrase_enabled);
   if (!passphrase_enabled)
-    passphrase_textfield_->SetText(string16());
+    passphrase_textfield_->SetText(base::string16());
 
   // User cert.
   bool certs_loading = CertLibrary::Get()->CertificatesLoading();
@@ -526,7 +526,7 @@ void WifiConfigView::RefreshEapFields() {
   subject_match_label_->SetEnabled(subject_match_enabled);
   subject_match_textfield_->SetEnabled(subject_match_enabled);
   if (!subject_match_enabled)
-    subject_match_textfield_->SetText(string16());
+    subject_match_textfield_->SetText(base::string16());
 
   // No anonymous identity if no phase 2 auth.
   bool identity_anonymous_enabled = phase_2_auth_enabled;
@@ -534,7 +534,7 @@ void WifiConfigView::RefreshEapFields() {
       identity_anonymous_enabled && identity_anonymous_ui_data_.IsEditable());
   identity_anonymous_label_->SetEnabled(identity_anonymous_enabled);
   if (!identity_anonymous_enabled)
-    identity_anonymous_textfield_->SetText(string16());
+    identity_anonymous_textfield_->SetText(base::string16());
 
   RefreshShareCheckbox();
 }