Replace string16 with base::string16.

chrome/browser/certificate_manager_model.h

 // 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.
 
 #ifndef CHROME_BROWSER_CERTIFICATE_MANAGER_MODEL_H_
 #define CHROME_BROWSER_CERTIFICATE_MANAGER_MODEL_H_
 
 #include <map>
 #include <string>
 
@@ skipping 36 matching lines @@
   // Following this call, the observer CertificatesRefreshed method will be
   // called so the view can call FilterAndBuildOrgGroupingMap as necessary to
   // refresh its tree views.
   void Refresh();
 
   // Fill |map| with the certificates matching |filter_type|.
   void FilterAndBuildOrgGroupingMap(net::CertType filter_type,
                                     OrgGroupingMap* map) const;
 
   // Get the data to be displayed in |column| for the given |cert|.
-  string16 GetColumnText(const net::X509Certificate& cert, Column column) const;
+  base::string16 GetColumnText(const net::X509Certificate& cert, Column column) const;
 
   // Import private keys and certificates from PKCS #12 encoded
   // |data|, using the given |password|. If |is_extractable| is false,
   // mark the private key as unextractable from the module.
   // Returns a net error code on failure.
   int ImportFromPKCS12(net::CryptoModule* module, const std::string& data,
-                       const string16& password, bool is_extractable);
+                       const base::string16& password, bool is_extractable);
 
   // Import CA certificates.
   // Tries to import all the certificates given.  The root will be trusted
   // according to |trust_bits|.  Any certificates that could not be imported
   // will be listed in |not_imported|.
   // |trust_bits| should be a bit field of TRUST* values from NSSCertDatabase.
   // Returns false if there is an internal error, otherwise true is returned and
   // |not_imported| should be checked for any certificates that were not
   // imported.
   bool ImportCACerts(const net::CertificateList& certificates,
@@ skipping 37 matching lines @@
   net::NSSCertDatabase* cert_db_;
   net::CertificateList cert_list_;
 
   // The observer to notify when certificate list is refreshed.
   Observer* observer_;
 
   DISALLOW_COPY_AND_ASSIGN(CertificateManagerModel);
 };
 
 #endif  // CHROME_BROWSER_CERTIFICATE_MANAGER_MODEL_H_