Replace string16 with base::string16.

chrome/browser/certificate_manager_model.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/certificate_manager_model.h"
 
 #include "base/bind.h"
 #include "base/i18n/time_formatting.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 48 matching lines @@
     std::string org;
     if (!cert->subject().organization_names.empty())
       org = cert->subject().organization_names[0];
     if (org.empty())
       org = cert->subject().GetDisplayName();
 
     (*map)[org].push_back(cert);
   }
 }
 
-string16 CertificateManagerModel::GetColumnText(
+base::string16 CertificateManagerModel::GetColumnText(
     const net::X509Certificate& cert,
     Column column) const {
-  string16 rv;
+  base::string16 rv;
   switch (column) {
     case COL_SUBJECT_NAME:
       rv = UTF8ToUTF16(
           x509_certificate_model::GetCertNameOrNickname(cert.os_cert_handle()));
 
       // TODO(xiyuan): Put this into a column when we have js tree-table.
       if (IsHardwareBacked(&cert)) {
         rv = l10n_util::GetStringFUTF16(
             IDS_CERT_MANAGER_HARDWARE_BACKED_KEY_FORMAT,
             rv,
@@ skipping 13 matching lines @@
         rv = base::TimeFormatShortDateNumeric(cert.valid_expiry());
       break;
     default:
       NOTREACHED();
   }
   return rv;
 }
 
 int CertificateManagerModel::ImportFromPKCS12(net::CryptoModule* module,
                                               const std::string& data,
-                                              const string16& password,
+                                              const base::string16& password,
                                               bool is_extractable) {
   int result = cert_db_->ImportFromPKCS12(module, data, password,
                                           is_extractable, NULL);
   if (result == net::OK)
     Refresh();
   return result;
 }
 
 bool CertificateManagerModel::ImportCACerts(
     const net::CertificateList& certificates,
@@ skipping 27 matching lines @@
   bool result = cert_db_->DeleteCertAndKey(cert);
   if (result)
     Refresh();
   return result;
 }
 
 bool CertificateManagerModel::IsHardwareBacked(
     const net::X509Certificate* cert) const {
   return cert_db_->IsHardwareBacked(cert);
 }