diff options
Diffstat (limited to 'chrome/browser/printing')
| -rw-r--r-- | chrome/browser/printing/print_dialog_cloud.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/printing/printing_layout_browsertest.cc | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/printing/print_dialog_cloud.cc b/chrome/browser/printing/print_dialog_cloud.cc index d60d423..c5ebd4a 100644 --- a/chrome/browser/printing/print_dialog_cloud.cc +++ b/chrome/browser/printing/print_dialog_cloud.cc @@ -161,17 +161,17 @@ string16 GetSwitchValueString16(const CommandLine& command_line, void CloudPrintDataSenderHelper::CallJavascriptFunction( const std::wstring& function_name) { - web_ui_->CallJavascriptFunction(base::WideToASCII(function_name)); + web_ui_->CallJavascriptFunction(WideToASCII(function_name)); } void CloudPrintDataSenderHelper::CallJavascriptFunction( const std::wstring& function_name, const Value& arg) { - web_ui_->CallJavascriptFunction(base::WideToASCII(function_name), 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(base::WideToASCII(function_name), arg1, arg2); + web_ui_->CallJavascriptFunction(WideToASCII(function_name), arg1, arg2); } void CloudPrintDataSenderHelper::CallJavascriptFunction( @@ -180,7 +180,7 @@ void CloudPrintDataSenderHelper::CallJavascriptFunction( const Value& arg2, const Value& arg3) { web_ui_->CallJavascriptFunction( - base::WideToASCII(function_name), arg1, arg2, arg3); + WideToASCII(function_name), arg1, arg2, arg3); } // Clears out the pointer we're using to communicate. Either routine is diff --git a/chrome/browser/printing/printing_layout_browsertest.cc b/chrome/browser/printing/printing_layout_browsertest.cc index c930ac0..73053ac 100644 --- a/chrome/browser/printing/printing_layout_browsertest.cc +++ b/chrome/browser/printing/printing_layout_browsertest.cc @@ -141,7 +141,7 @@ class PrintingLayoutTest : public PrintingTest<InProcessBrowserTest>, Image png_content(png); double diff_emf = emf_content.PercentageDifferent(test_content); - EXPECT_EQ(0., diff_emf) << base::WideToUTF8(verification_name) << + EXPECT_EQ(0., diff_emf) << WideToUTF8(verification_name) << " original size:" << emf_content.size().ToString() << " result size:" << test_content.size().ToString(); if (diff_emf) { @@ -154,7 +154,7 @@ class PrintingLayoutTest : public PrintingTest<InProcessBrowserTest>, // This verification is only to know that the EMF rendering stays // immutable. double diff_png = emf_content.PercentageDifferent(png_content); - EXPECT_EQ(0., diff_png) << base::WideToUTF8(verification_name) << + EXPECT_EQ(0., diff_png) << WideToUTF8(verification_name) << " original size:" << emf_content.size().ToString() << " result size:" << test_content.size().ToString(); if (diff_png) { @@ -204,7 +204,7 @@ class PrintingLayoutTest : public PrintingTest<InProcessBrowserTest>, base::FilePath file; while (!(file = enumerator.Next()).empty()) { std::wstring ext = file.Extension(); - if (base::strcasecmp(base::WideToUTF8(ext).c_str(), ".emf") == 0) { + if (base::strcasecmp(WideToUTF8(ext).c_str(), ".emf") == 0) { EXPECT_FALSE(found_emf) << "Found a leftover .EMF file: \"" << emf_file << "\" and \"" << file.value() << "\" when looking for \"" << verification_name << "\""; @@ -212,7 +212,7 @@ class PrintingLayoutTest : public PrintingTest<InProcessBrowserTest>, emf_file = file.value(); continue; } - if (base::strcasecmp(base::WideToUTF8(ext).c_str(), ".prn") == 0) { + if (base::strcasecmp(WideToUTF8(ext).c_str(), ".prn") == 0) { EXPECT_FALSE(found_prn) << "Found a leftover .PRN file: \"" << prn_file << "\" and \"" << file.value() << "\" when looking for \"" << verification_name << "\""; |