Replace string16 with base::string16.

chrome/browser/chromeos/options/cert_library.cc

 // Copyright 2013 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/cert_library.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/i18n/string_compare.h"
@@ skipping 18 matching lines @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_collator.h"
 
 namespace chromeos {
 
 namespace {
 
 // Root CA certificates that are built into Chrome use this token name.
 const char kRootCertificateTokenName[] = "Builtin Object Token";
 
-string16 GetDisplayString(net::X509Certificate* cert, bool hardware_backed) {
+base::string16 GetDisplayString(net::X509Certificate* cert, bool hardware_backed) {
   std::string org;
   if (!cert->subject().organization_names.empty())
     org = cert->subject().organization_names[0];
   if (org.empty())
     org = cert->subject().GetDisplayName();
-  string16 issued_by = UTF8ToUTF16(
+  base::string16 issued_by = UTF8ToUTF16(
       x509_certificate_model::GetIssuerCommonName(cert->os_cert_handle(),
                                                   org));  // alternative text
-  string16 issued_to = UTF8ToUTF16(
+  base::string16 issued_to = UTF8ToUTF16(
       x509_certificate_model::GetCertNameOrNickname(cert->os_cert_handle()));
 
   if (hardware_backed) {
     return l10n_util::GetStringFUTF16(
         IDS_CERT_MANAGER_HARDWARE_BACKED_KEY_FORMAT_LONG,
         issued_by,
         issued_to,
         l10n_util::GetStringUTF16(IDS_CERT_MANAGER_HARDWARE_BACKED));
   } else {
     return l10n_util::GetStringFUTF16(
@@ skipping 16 matching lines @@
 }  // namespace
 
 class CertNameComparator {
  public:
   explicit CertNameComparator(icu::Collator* collator)
       : collator_(collator) {
   }
 
   bool operator()(const scoped_refptr<net::X509Certificate>& lhs,
                   const scoped_refptr<net::X509Certificate>& rhs) const {
-    string16 lhs_name = GetDisplayString(lhs.get(), false);
-    string16 rhs_name = GetDisplayString(rhs.get(), false);
+    base::string16 lhs_name = GetDisplayString(lhs.get(), false);
+    base::string16 rhs_name = GetDisplayString(rhs.get(), false);
     if (collator_ == NULL)
       return lhs_name < rhs_name;
     return base::i18n::CompareString16WithCollator(
         collator_, lhs_name, rhs_name) == UCOL_LESS;
   }
 
  private:
   icu::Collator* collator_;
 };
 
@@ skipping 178 matching lines @@
     return user_certs_;
   if (type == CERT_TYPE_SERVER)
     return server_certs_;
   if (type == CERT_TYPE_SERVER_CA)
     return server_ca_certs_;
   DCHECK(type == CERT_TYPE_DEFAULT);
   return certs_;
 }
 
 }  // namespace chromeos