| Index: chrome/browser/printing/print_dialog_cloud_unittest.cc
|
| diff --git a/chrome/browser/printing/print_dialog_cloud_unittest.cc b/chrome/browser/printing/print_dialog_cloud_unittest.cc
|
| index c6d3153f5f74bba62a9385c001dfef6dedd2b522..89e61286c475c478e170aff9870cf6b4e3281f10 100644
|
| --- a/chrome/browser/printing/print_dialog_cloud_unittest.cc
|
| +++ b/chrome/browser/printing/print_dialog_cloud_unittest.cc
|
| @@ -15,7 +15,6 @@
|
| #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"
|
| @@ -137,10 +136,7 @@ class MockCloudPrintDataSenderHelper : public CloudPrintDataSenderHelper {
|
| // 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));
|
| };
|
| @@ -224,8 +220,8 @@ class CloudPrintDataSenderTest : public testing::Test {
|
| 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);
|
| }
|
|
|