Use base namespace for string16 in components and cloud_print.

components/policy/core/browser/policy_error_map.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 "components/policy/core/browser/policy_error_map.h"
 
 #include <utility>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 74 matching lines @@
   AddError(PendingError(policy, subkey, -1, message_id, replacement));
 }
 
 void PolicyErrorMap::AddError(const std::string& policy,
                               int index,
                               int message_id,
                               const std::string& replacement) {
   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');
 }
 
 bool PolicyErrorMap::empty() {
   CheckReadyAndConvert();
   return map_.empty();
 }
 
@@ skipping 19 matching lines @@
 
 void PolicyErrorMap::AddError(const PendingError& error) {
   if (IsReady()) {
     Convert(error);
   } else {
     pending_.push_back(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),
                                          submessage);
   } else if (error.index >= 0) {
     message = l10n_util::GetStringFUTF16(IDS_POLICY_LIST_ENTRY_ERROR,
                                          base::IntToString16(error.index),
                                          submessage);
   } else {
     message = submessage;
   }
   map_.insert(std::make_pair(error.policy, message));
 }
 
 void PolicyErrorMap::CheckReadyAndConvert() {
   DCHECK(IsReady());
   for (size_t i = 0; i < pending_.size(); ++i) {
     Convert(pending_[i]);
   }
   pending_.clear();
 }
 
 }  // namespace policy