summaryrefslogtreecommitdiffstats
path: root/chrome/browser/printing/print_dialog_cloud_uitest.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-08 15:42:00 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-08 15:42:00 +0000
commit7024d3eea1d8328883736f5cd3cbef480aa0e740 (patch)
tree5fc40e7da24d79306321037359bce7bd97bcf36b /chrome/browser/printing/print_dialog_cloud_uitest.cc
parente9ff5e31b28b6ee684ceaf47afe4f483163f6d1d (diff)
downloadchromium_src-7024d3eea1d8328883736f5cd3cbef480aa0e740.zip
chromium_src-7024d3eea1d8328883736f5cd3cbef480aa0e740.tar.gz
chromium_src-7024d3eea1d8328883736f5cd3cbef480aa0e740.tar.bz2
Remove wstring from RVH's run Javascript command.
BUG=23581 TEST=no visible changes; all tests pass Review URL: http://codereview.chromium.org/6312154 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74118 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/printing/print_dialog_cloud_uitest.cc')
-rw-r--r--chrome/browser/printing/print_dialog_cloud_uitest.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/printing/print_dialog_cloud_uitest.cc b/chrome/browser/printing/print_dialog_cloud_uitest.cc
index e64ff81..caced65 100644
--- a/chrome/browser/printing/print_dialog_cloud_uitest.cc
+++ b/chrome/browser/printing/print_dialog_cloud_uitest.cc
@@ -12,6 +12,7 @@
#include "base/path_service.h"
#include "base/singleton.h"
#include "base/threading/thread_restrictions.h"
+#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/browser/browser_list.h"
#include "chrome/browser/browser_thread.h"
@@ -249,9 +250,9 @@ IN_PROC_BROWSER_TEST_F(PrintDialogCloudTest, DISABLED_DialogGrabbed) {
ASSERT_TRUE(browser()->GetSelectedTabContents());
ASSERT_TRUE(browser()->GetSelectedTabContents()->render_view_host());
- std::wstring window_print(L"window.print()");
+ string16 window_print = ASCIIToUTF16("window.print()");
browser()->GetSelectedTabContents()->render_view_host()->
- ExecuteJavascriptInWebFrame(std::wstring(), window_print);
+ ExecuteJavascriptInWebFrame(string16(), window_print);
ui_test_utils::RunMessageLoop();