Replace string16 with base::string16.

chrome/browser/certificate_manager_model.h

Index: chrome/browser/certificate_manager_model.h
diff --git a/chrome/browser/certificate_manager_model.h b/chrome/browser/certificate_manager_model.h
index b0fc264c17ef7cbcc15551711ddb8ea7054caf83..9467c59569954aa833fb6883405e867de7c39e69 100644
--- a/chrome/browser/certificate_manager_model.h
+++ b/chrome/browser/certificate_manager_model.h
@@ -54,14 +54,14 @@ class CertificateManagerModel {
                                     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