Cleanup: Do not use wstrings in the cloud print dialog.

chrome/browser/printing/print_dialog_cloud.cc

 // 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.
 
 #include "chrome/browser/printing/print_dialog_cloud.h"
 
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 18 matching lines @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/browser/web_ui.h"
-#include "grit/generated_resources.h"
-#include "ui/base/l10n/l10n_util.h"
 #include "webkit/common/webpreferences.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #endif
 
 #if defined(OS_WIN)
 #include "ui/base/win/foreground_helper.h"
 #endif
@@ skipping 82 matching lines @@
 
   bool result = true;
   DictionaryValue* params = static_cast<DictionaryValue*>(parsed_value.get());
   result &= params->GetDouble("dpi", &parameters.dpi);
   result &= params->GetDouble("min_shrink", &parameters.min_shrink);
   result &= params->GetDouble("max_shrink", &parameters.max_shrink);
   result &= params->GetBoolean("selection_only", &parameters.selection_only);
   return result;
 }
 
-string16 GetSwitchValueString16(const CommandLine& command_line,
-                                const char* switchName) {
+base::string16 GetSwitchValueString16(const CommandLine& command_line,
+                                      const char* switchName) {
 #if defined(OS_WIN)
-  CommandLine::StringType native_switch_val;
-  native_switch_val = command_line.GetSwitchValueNative(switchName);
-  return string16(native_switch_val);
+  return command_line.GetSwitchValueNative(switchName);
 #elif defined(OS_POSIX)
   // POSIX Command line string types are different.
   CommandLine::StringType native_switch_val;
   native_switch_val = command_line.GetSwitchValueASCII(switchName);
   // Convert the ASCII string to UTF16 to prepare to pass.
-  return string16(ASCIIToUTF16(native_switch_val));
+  return base::ASCIIToUTF16(native_switch_val);
 #endif
 }
 
 void CloudPrintDataSenderHelper::CallJavascriptFunction(
-    const std::wstring& function_name) {
-  web_ui_->CallJavascriptFunction(WideToASCII(function_name));
-}
-
-void CloudPrintDataSenderHelper::CallJavascriptFunction(
-    const std::wstring& function_name, const Value& arg) {
-  web_ui_->CallJavascriptFunction(WideToASCII(function_name), arg);
-}
-
-void CloudPrintDataSenderHelper::CallJavascriptFunction(
-    const std::wstring& function_name, const Value& arg1, const Value& arg2) {
-  web_ui_->CallJavascriptFunction(WideToASCII(function_name), arg1, arg2);
-}
-
-void CloudPrintDataSenderHelper::CallJavascriptFunction(
-    const std::wstring& function_name,
-    const Value& arg1,
-    const Value& arg2,
-    const Value& arg3) {
-  web_ui_->CallJavascriptFunction(
-      WideToASCII(function_name), arg1, arg2, arg3);
+    const std::string& function_name, const Value& arg1, const Value& arg2) {
+  web_ui_->CallJavascriptFunction(function_name, arg1, arg2);
 }
 
 // Clears out the pointer we're using to communicate.  Either routine is
 // potentially expensive enough that stopping whatever is in progress
 // is worth it.
 void CloudPrintDataSender::CancelPrintDataFile() {
   base::AutoLock lock(lock_);
   // We don't own helper, it was passed in to us, so no need to
   // delete, just let it go.
   helper_ = NULL;
@@ skipping 31 matching lines @@
       base::StringPiece(reinterpret_cast<const char*>(data_->front()),
                         data_->size()),
       &base64_data);
   std::string header("data:");
   header.append(file_type_);
   header.append(";base64,");
   base64_data.insert(0, header);
 
   base::AutoLock lock(lock_);
   if (helper_) {
-    StringValue title(print_job_title_);
-    StringValue ticket(print_ticket_);
+    base::StringValue title(print_job_title_);
+    base::StringValue ticket(print_ticket_);
     // TODO(abodenha): Change Javascript call to pass in print ticket
     // after server side support is added. Add test for it.
 
     // Send the print data to the dialog contents.  The JavaScript
     // function is a preliminary API for prototyping purposes and is
     // subject to change.
-    const_cast<CloudPrintDataSenderHelper*>(helper_)->CallJavascriptFunction(
-        L"printApp._printDataUrl", StringValue(base64_data), title);
+    helper_->CallJavascriptFunction(
+        "printApp._printDataUrl", base::StringValue(base64_data), title);
   }
 }
 
 
 CloudPrintFlowHandler::CloudPrintFlowHandler(const base::RefCountedMemory* data,
                                              const string16& print_job_title,
                                              const string16& print_ticket,
                                              const std::string& file_type,
                                              bool close_after_signin,
                                              const base::Closure& callback)
@@ skipping 530 matching lines @@
           print_job_print_ticket,
           file_type,
           delete_on_close);
       return true;
     }
   }
   return false;
 }
 
 }  // namespace print_dialog_cloud