Use base namespace for string16 in components and cloud_print.

R=scottbyer@chromium.org
TBR=scottbyer

Review URL: https://codereview.chromium.org/107383002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239255 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 8 insertions, 8 deletions

diff --git a/components/policy/core/browser/policy_error_map.cc b/components/policy/core/browser/policy_error_map.cc
index 0c358c5..95708ac 100644
--- a/components/policy/core/browser/policy_error_map.cc
+++ b/components/policy/core/browser/policy_error_map.cc
@@ -92,10 +92,10 @@ void PolicyErrorMap::AddError(const std::string& policy,
   AddError(PendingError(policy, std::string(), index, message_id, replacement));
 }
 
-string16 PolicyErrorMap::GetErrors(const std::string& policy) {
+base::string16 PolicyErrorMap::GetErrors(const std::string& policy) {
   CheckReadyAndConvert();
   std::pair<const_iterator, const_iterator> range = map_.equal_range(policy);
-  std::vector<string16> list;
+  std::vector<base::string16> list;
   for (const_iterator it = range.first; it != range.second; ++it)
     list.push_back(it->second);
   return JoinString(list, '\n');
@@ -135,14 +135,14 @@ void PolicyErrorMap::AddError(const PendingError& error) {
 }
 
 void PolicyErrorMap::Convert(const PendingError& error) {
-  string16 submessage;
+  base::string16 submessage;
   if (error.has_replacement) {
     submessage = l10n_util::GetStringFUTF16(error.message_id,
                                             ASCIIToUTF16(error.replacement));
   } else {
     submessage = l10n_util::GetStringUTF16(error.message_id);
   }
-  string16 message;
+  base::string16 message;
   if (!error.subkey.empty()) {
     message = l10n_util::GetStringFUTF16(IDS_POLICY_SUBKEY_ERROR,
                                          ASCIIToUTF16(error.subkey),
diff --git a/components/policy/core/browser/policy_error_map.h b/components/policy/core/browser/policy_error_map.h
index afc9706..d3cc747 100644
--- a/components/policy/core/browser/policy_error_map.h
+++ b/components/policy/core/browser/policy_error_map.h
@@ -18,7 +18,7 @@ namespace policy {
 // Collects error messages and their associated policies.
 class POLICY_EXPORT PolicyErrorMap {
  public:
-  typedef std::multimap<std::string, string16> PolicyMapType;
+  typedef std::multimap<std::string, base::string16> PolicyMapType;
   typedef PolicyMapType::const_iterator const_iterator;
 
   PolicyErrorMap();
@@ -70,7 +70,7 @@ class POLICY_EXPORT PolicyErrorMap {
 
   // Returns all the error messages stored for |policy|, separated by a white
   // space. Returns an empty string if there are no errors for |policy|.
-  string16 GetErrors(const std::string& policy);
+  base::string16 GetErrors(const std::string& policy);
 
   bool empty();
   size_t size();
diff --git a/components/policy/core/common/registry_dict_win.cc b/components/policy/core/common/registry_dict_win.cc
index 7673079..a2bb688 100644
--- a/components/policy/core/common/registry_dict_win.cc
+++ b/components/policy/core/common/registry_dict_win.cc
@@ -295,7 +295,7 @@ void RegistryDict::Swap(RegistryDict* other) {
   values_.swap(other->values_);
 }
 
-void RegistryDict::ReadRegistry(HKEY hive, const string16& root) {
+void RegistryDict::ReadRegistry(HKEY hive, const base::string16& root) {
   ClearKeys();
   ClearValues();
 
diff --git a/components/policy/core/common/registry_dict_win.h b/components/policy/core/common/registry_dict_win.h
index 1cce59b..fb48091 100644
--- a/components/policy/core/common/registry_dict_win.h
+++ b/components/policy/core/common/registry_dict_win.h
@@ -67,7 +67,7 @@ class POLICY_EXPORT RegistryDict {
   void Swap(RegistryDict* other);
 
   // Read a Windows registry subtree into this registry dictionary object.
-  void ReadRegistry(HKEY hive, const string16& root);
+  void ReadRegistry(HKEY hive, const base::string16& root);
 
   // Converts the dictionary to base::Value representation. For key/value name
   // collisions, the key wins. |schema| supplies an optional JSON schema that