Replace string16 with base::string16.

chrome/browser/chromeos/options/vpn_config_view.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/options/vpn_config_view.h"
 
 #include "ash/system/chromeos/network/network_connect.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 28 matching lines @@
 
 namespace {
 
 enum ProviderTypeIndex {
   PROVIDER_TYPE_INDEX_L2TP_IPSEC_PSK = 0,
   PROVIDER_TYPE_INDEX_L2TP_IPSEC_USER_CERT = 1,
   PROVIDER_TYPE_INDEX_OPEN_VPN = 2,
   PROVIDER_TYPE_INDEX_MAX = 3,
 };
 
-string16 ProviderTypeIndexToString(int index) {
+base::string16 ProviderTypeIndexToString(int index) {
   switch (index) {
     case PROVIDER_TYPE_INDEX_L2TP_IPSEC_PSK:
       return l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_L2TP_IPSEC_PSK);
     case PROVIDER_TYPE_INDEX_L2TP_IPSEC_USER_CERT:
       return l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_L2TP_IPSEC_USER_CERT);
     case PROVIDER_TYPE_INDEX_OPEN_VPN:
       return l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_OPEN_VPN);
   }
   NOTREACHED();
-  return string16();
+  return base::string16();
 }
 
 int ProviderTypeToIndex(const std::string& provider_type,
                         const std::string& client_cert_id) {
   if (provider_type == shill::kProviderL2tpIpsec) {
     if (!client_cert_id.empty())
       return PROVIDER_TYPE_INDEX_L2TP_IPSEC_USER_CERT;
     else
       return PROVIDER_TYPE_INDEX_L2TP_IPSEC_PSK;
   } else {
@@ skipping 33 matching lines @@
 
 namespace internal {
 
 class ProviderTypeComboboxModel : public ui::ComboboxModel {
  public:
   ProviderTypeComboboxModel();
   virtual ~ProviderTypeComboboxModel();
 
   // 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(ProviderTypeComboboxModel);
 };
 
 class VpnServerCACertComboboxModel : public ui::ComboboxModel {
  public:
   VpnServerCACertComboboxModel();
   virtual ~VpnServerCACertComboboxModel();
 
   // 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(VpnServerCACertComboboxModel);
 };
 
 class VpnUserCertComboboxModel : public ui::ComboboxModel {
  public:
   VpnUserCertComboboxModel();
   virtual ~VpnUserCertComboboxModel();
 
   // 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(VpnUserCertComboboxModel);
 };
 
 // ProviderTypeComboboxModel ---------------------------------------------------
 
 ProviderTypeComboboxModel::ProviderTypeComboboxModel() {
 }
 
 ProviderTypeComboboxModel::~ProviderTypeComboboxModel() {
 }
 
 int ProviderTypeComboboxModel::GetItemCount() const {
   return PROVIDER_TYPE_INDEX_MAX;
 }
 
-string16 ProviderTypeComboboxModel::GetItemAt(int index) {
+base::string16 ProviderTypeComboboxModel::GetItemAt(int index) {
   return ProviderTypeIndexToString(index);
 }
 
 // VpnServerCACertComboboxModel ------------------------------------------------
 
 VpnServerCACertComboboxModel::VpnServerCACertComboboxModel() {
 }
 
 VpnServerCACertComboboxModel::~VpnServerCACertComboboxModel() {
 }
 
 int VpnServerCACertComboboxModel::GetItemCount() const {
   if (CertLibrary::Get()->CertificatesLoading())
     return 1;  // "Loading"
   // "Default" + certs.
   return CertLibrary::Get()->NumCertificates(
       CertLibrary::CERT_TYPE_SERVER_CA) + 1;
 }
 
-string16 VpnServerCACertComboboxModel::GetItemAt(int index) {
+base::string16 VpnServerCACertComboboxModel::GetItemAt(int index) {
   if (CertLibrary::Get()->CertificatesLoading())
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_LOADING);
   if (index == 0)
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_SERVER_CA_DEFAULT);
   int cert_index = index - 1;
   return CertLibrary::Get()->GetCertDisplayStringAt(
       CertLibrary::CERT_TYPE_SERVER_CA, cert_index);
 }
 
 // VpnUserCertComboboxModel ----------------------------------------------------
 
 VpnUserCertComboboxModel::VpnUserCertComboboxModel() {
 }
 
 VpnUserCertComboboxModel::~VpnUserCertComboboxModel() {
 }
 
 int VpnUserCertComboboxModel::GetItemCount() const {
   if (CertLibrary::Get()->CertificatesLoading())
     return 1;  // "Loading"
   int num_certs =
       CertLibrary::Get()->NumCertificates(CertLibrary::CERT_TYPE_USER);
   if (num_certs == 0)
     return 1;  // "None installed"
   return num_certs;
 }
 
-string16 VpnUserCertComboboxModel::GetItemAt(int index) {
+base::string16 VpnUserCertComboboxModel::GetItemAt(int index) {
   if (CertLibrary::Get()->CertificatesLoading()) {
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_LOADING);
   }
   if (CertLibrary::Get()->NumCertificates(CertLibrary::CERT_TYPE_USER) == 0) {
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_USER_CERT_NONE_INSTALLED);
   }
   return CertLibrary::Get()->GetCertDisplayStringAt(
       CertLibrary::CERT_TYPE_USER, index);
@@ skipping 34 matching lines @@
       provider_type_index_(PROVIDER_TYPE_INDEX_MAX),
       weak_ptr_factory_(this) {
   Init();
 }
 
 VPNConfigView::~VPNConfigView() {
   RemoveAllChildViews(true);  // Destroy children before models
   CertLibrary::Get()->RemoveObserver(this);
 }
 
-string16 VPNConfigView::GetTitle() const {
+base::string16 VPNConfigView::GetTitle() const {
   DCHECK_NE(title_, 0);
   return l10n_util::GetStringUTF16(title_);
 }
 
 views::View* VPNConfigView::GetInitiallyFocusedView() {
   if (service_path_.empty()) {
     // Put focus in the first editable field.
     if (server_textfield_)
       return server_textfield_;
     else if (service_textfield_)
@@ skipping 27 matching lines @@
   // Block login if certs are required but user has none.
   bool cert_required =
       GetProviderTypeIndex() == PROVIDER_TYPE_INDEX_L2TP_IPSEC_USER_CERT;
   if (cert_required && (!HaveUserCerts() || !IsUserCertValid()))
     return false;
 
   return true;
 }
 
 void VPNConfigView::ContentsChanged(views::Textfield* sender,
-                                    const string16& new_contents) {
+                                    const base::string16& new_contents) {
   if (sender == server_textfield_ && !service_text_modified_) {
     // Set the service name to the server name up to '.', unless it has
     // been explicitly set by the user.
-    string16 server = server_textfield_->text();
-    string16::size_type n = server.find_first_of(L'.');
+    base::string16 server = server_textfield_->text();
+    base::string16::size_type n = server.find_first_of(L'.');
     service_name_from_server_ = server.substr(0, n);
     service_textfield_->SetText(service_name_from_server_);
   }
   if (sender == service_textfield_) {
     if (new_contents.empty())
       service_text_modified_ = false;
     else if (new_contents != service_name_from_server_)
       service_text_modified_ = true;
   }
   UpdateCanLogin();
@@ skipping 635 matching lines @@
 
   if (group_name_label_)
     group_name_label_->SetEnabled(enable_group_name_);
   if (group_name_textfield_)
     group_name_textfield_->SetEnabled(enable_group_name_ &&
                                       group_name_ui_data_.IsEditable());
 }
 
 void VPNConfigView::UpdateErrorLabel() {
   // Error message.
-  string16 error_msg;
+  base::string16 error_msg;
   bool cert_required =
       GetProviderTypeIndex() == PROVIDER_TYPE_INDEX_L2TP_IPSEC_USER_CERT;
   if (cert_required && CertLibrary::Get()->CertificatesLoaded()) {
     if (!HaveUserCerts()) {
       error_msg = l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PLEASE_INSTALL_USER_CERT);
     } else if (!IsUserCertValid()) {
       error_msg = l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_REQUIRE_HARDWARE_BACKED);
     }
@@ skipping 67 matching lines @@
   property_ui_data->ParseOncProperty(
       onc_source,
       onc,
       base::StringPrintf("%s.%s.%s",
                          ::onc::network_config::kVPN,
                          dict_key.c_str(),
                          key.c_str()));
 }
 
 }  // namespace chromeos