Use base namespace for string16 in components and cloud_print.

cloud_print/service/win/cloud_print_service.cc

Index: cloud_print/service/win/cloud_print_service.cc
diff --git a/cloud_print/service/win/cloud_print_service.cc b/cloud_print/service/win/cloud_print_service.cc
index 32fbe802413360152b96a8ae5179025d7f4458b2..eedbb0c572f68623ba8a10562209cf2a056a8998 100644
--- a/cloud_print/service/win/cloud_print_service.cc
+++ b/cloud_print/service/win/cloud_print_service.cc
@@ -80,12 +80,12 @@ void InvalidUsage() {
   std::cout << "\n";
 }
 
-string16 GetOption(int string_id, const string16& default,
+base::string16 GetOption(int string_id, const base::string16& default,
                    bool secure) {
-  string16 prompt_format = cloud_print::LoadLocalString(string_id) ;
-  std::vector<string16> substitutions(1, default);
+  base::string16 prompt_format = cloud_print::LoadLocalString(string_id) ;

[Scott Byer, 2013/12/06 17:28:06]

nit: extra space before semicolon.

+  std::vector<base::string16> substitutions(1, default);
   std::cout << ReplaceStringPlaceholders(prompt_format, substitutions, NULL);
-  string16 tmp;
+  base::string16 tmp;
   if (secure) {
     DWORD saved_mode = 0;
     // Don't close.
@@ -110,7 +110,7 @@ HRESULT ReportError(HRESULT hr, int string_id) {
   return hr;
 }
 
-string16 StateAsString(ServiceController::State state) {
+base::string16 StateAsString(ServiceController::State state) {
   DWORD string_id = 0;
   switch(state) {
   case ServiceController::STATE_NOT_FOUND:
@@ -123,7 +123,7 @@ string16 StateAsString(ServiceController::State state) {
     string_id = IDS_SERVICE_RUNNING;
     break;
   }
-  return string_id ? cloud_print::LoadLocalString(string_id) : string16();
+  return string_id ? cloud_print::LoadLocalString(string_id) : base::string16();
 }
 
 }  // namespace
@@ -214,8 +214,8 @@ class CloudPrintServiceModule
       return controller_->UninstallService();
 
     if (command_line.HasSwitch(kInstallSwitch)) {
-      string16 run_as_user;
-      string16 run_as_password;
+      base::string16 run_as_user;
+      base::string16 run_as_password;
       base::FilePath user_data_dir;
       std::vector<std::string> printers;
       HRESULT hr = SelectWindowsAccount(&run_as_user, &run_as_password,
@@ -262,7 +262,8 @@ class CloudPrintServiceModule
     return S_FALSE;
   }
 
-  HRESULT SelectWindowsAccount(string16* run_as_user, string16* run_as_password,
+  HRESULT SelectWindowsAccount(base::string16* run_as_user,
+                               base::string16* run_as_password,
                                base::FilePath* user_data_dir,
                                std::vector<std::string>* printers) {
     *run_as_user = GetCurrentUserName();
@@ -339,7 +340,7 @@ class CloudPrintServiceModule
 
     LOG(INFO) << file.value() << ": " << contents;
 
-    string16 message =
+    base::string16 message =
         cloud_print::LoadLocalString(IDS_ADD_PRINTERS_USING_CHROME);
     std::cout << "\n" << message.c_str() << "\n" ;
     std::string new_contents =