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

chrome/browser/printing/print_dialog_cloud_unittest.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 "chrome/browser/printing/print_dialog_cloud_internal.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
-#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_url.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/test/test_browser_thread.h"
@@ skipping 101 matching lines @@
   MOCK_METHOD1(RenderViewCreated,
                void(content::RenderViewHost* render_view_host));
 };
 
 class MockCloudPrintDataSenderHelper : public CloudPrintDataSenderHelper {
  public:
   // TODO(scottbyer): At some point this probably wants to use a
   // MockTabContents instead of NULL, and to pre-load it with a bunch
   // of expects/results.
   MockCloudPrintDataSenderHelper() : CloudPrintDataSenderHelper(NULL) {}
-  MOCK_METHOD1(CallJavascriptFunction, void(const std::wstring&));
-  MOCK_METHOD2(CallJavascriptFunction, void(const std::wstring&,
-                                            const Value& arg1));
-  MOCK_METHOD3(CallJavascriptFunction, void(const std::wstring&,
+  MOCK_METHOD3(CallJavascriptFunction, void(const std::string&,
                                             const Value& arg1,
                                             const Value& arg2));
 };
 
 class CloudPrintURLTest : public testing::Test {
  public:
   CloudPrintURLTest() {}
 
  protected:
   virtual void SetUp() {
@@ skipping 63 matching lines @@
         io_thread_(BrowserThread::IO, &message_loop_) {}
 
  protected:
   virtual void SetUp() {
     mock_helper_.reset(new MockCloudPrintDataSenderHelper);
   }
 
   scoped_refptr<CloudPrintDataSender> CreateSender(
       const base::RefCountedString* data) {
     return new CloudPrintDataSender(mock_helper_.get(),
-                                    ASCIIToUTF16(kMockJobTitle),
-                                    ASCIIToUTF16(kMockPrintTicket),
+                                    base::ASCIIToUTF16(kMockJobTitle),
+                                    base::ASCIIToUTF16(kMockPrintTicket),
                                     std::string("application/pdf"),
                                     data);
   }
 
   scoped_refptr<CloudPrintDataSender> print_data_sender_;
   scoped_ptr<MockCloudPrintDataSenderHelper> mock_helper_;
 
   base::MessageLoop message_loop_;
   content::TestBrowserThread file_thread_;
   content::TestBrowserThread io_thread_;
@@ skipping 100 matching lines @@
   std::vector<WebUIMessageHandler*> handlers;
   delegate_->GetWebUIMessageHandlers(&handlers);
   delegate_.reset();
   EXPECT_THAT(mock_flow_handler_.get(), NotNull());
 }
 
 // Testing for ExternalWebDialogUI needs a mock WebContents and mock
 // CloudPrintWebDialogDelegate (attached to the mock web_contents).
 
 // Testing for PrintDialogCloud needs a mock Browser.