Remove wstring from RVH's run Javascript command....

chrome/test/automation/automation_proxy_uitest.cc

 // Copyright (c) 2011 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 <string>
 
 #include "app/app_switches.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
@@ skipping 244 matching lines @@
   FilePath filename(test_data_directory_);
   filename = filename.AppendASCII("title2.html");
   ASSERT_TRUE(window->AppendTab(net::FilePathToFileURL(filename)));
 
   int appended_tab_index;
   // Append tab will also be active tab
   ASSERT_TRUE(window->GetActiveTabIndex(&appended_tab_index));
 
   scoped_refptr<TabProxy> tab(window->GetTab(appended_tab_index));
   ASSERT_TRUE(tab.get());
-  std::wstring title;
+  string16 title;
   ASSERT_TRUE(tab->GetTabTitle(&title));
-  ASSERT_STREQ(L"Title Of Awesomeness", title.c_str());
+  ASSERT_EQ(ASCIIToUTF16("Title Of Awesomeness"), title);
 }
 
 TEST_F(AutomationProxyTest, ActivateTab) {
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
 
   ASSERT_TRUE(window->AppendTab(GURL("about:blank")));
 
   ASSERT_TRUE(window->ActivateTab(1));
   int active_tab_index = -1;
   ASSERT_TRUE(window->GetActiveTabIndex(&active_tab_index));
   ASSERT_EQ(1, active_tab_index);
 
   ASSERT_TRUE(window->ActivateTab(0));
   ASSERT_TRUE(window->GetActiveTabIndex(&active_tab_index));
   ASSERT_EQ(0, active_tab_index);
 }
 
 TEST_F(AutomationProxyTest, GetTab) {
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
   {
     scoped_refptr<TabProxy> tab(window->GetTab(0));
     ASSERT_TRUE(tab.get());
-    std::wstring title;
+    string16 title;
     ASSERT_TRUE(tab->GetTabTitle(&title));
     // BUG [634097] : expected title should be "about:blank"
-    ASSERT_STREQ(L"", title.c_str());
+    ASSERT_EQ(string16(), title);
   }
 
   {
     ASSERT_FALSE(window->GetTab(-1));
   }
 
   {
     scoped_refptr<TabProxy> tab(window->GetTab(1));
     ASSERT_FALSE(tab.get());
   }
 };
 
 TEST_F(AutomationProxyTest, NavigateToURL) {
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
   scoped_refptr<TabProxy> tab(window->GetTab(0));
   ASSERT_TRUE(tab.get());
 
-  std::wstring title;
+  string16 title;
   ASSERT_TRUE(tab->GetTabTitle(&title));
   // BUG [634097] : expected title should be "about:blank"
-  ASSERT_STREQ(L"", title.c_str());
+  ASSERT_EQ(string16(), title);
 
   FilePath filename(test_data_directory_);
   filename = filename.AppendASCII("title2.html");
 
   ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
             tab->NavigateToURL(net::FilePathToFileURL(filename)));
   ASSERT_TRUE(tab->GetTabTitle(&title));
-  ASSERT_STREQ(L"Title Of Awesomeness", title.c_str());
+  ASSERT_EQ(ASCIIToUTF16("Title Of Awesomeness"), title);
 
   // TODO(vibhor) : Add a test using testserver.
 }
 
 TEST_F(AutomationProxyTest, GoBackForward) {
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
   scoped_refptr<TabProxy> tab(window->GetTab(0));
   ASSERT_TRUE(tab.get());
 
-  std::wstring title;
+  string16 title;
   ASSERT_TRUE(tab->GetTabTitle(&title));
   // BUG [634097] : expected title should be "about:blank"
-  ASSERT_STREQ(L"", title.c_str());
+  ASSERT_EQ(string16(), title);
 
   ASSERT_FALSE(tab->GoBack());
   ASSERT_TRUE(tab->GetTabTitle(&title));
-  ASSERT_STREQ(L"", title.c_str());
+  ASSERT_EQ(string16(), title);
 
   FilePath filename(test_data_directory_);
   filename = filename.AppendASCII("title2.html");
   ASSERT_TRUE(tab->NavigateToURL(net::FilePathToFileURL(filename)));
   ASSERT_TRUE(tab->GetTabTitle(&title));
-  ASSERT_STREQ(L"Title Of Awesomeness", title.c_str());
+  ASSERT_EQ(ASCIIToUTF16("Title Of Awesomeness"), title);
 
   ASSERT_TRUE(tab->GoBack());
   ASSERT_TRUE(tab->GetTabTitle(&title));
   // BUG [634097] : expected title should be "about:blank"
-  ASSERT_STREQ(L"", title.c_str());
+  ASSERT_EQ(string16(), title.c_str());
 
   ASSERT_TRUE(tab->GoForward());
   ASSERT_TRUE(tab->GetTabTitle(&title));
-  ASSERT_STREQ(L"Title Of Awesomeness", title.c_str());
+  ASSERT_EQ(ASCIIToUTF16("Title Of Awesomeness"), title);
 
   ASSERT_FALSE(tab->GoForward());
   ASSERT_TRUE(tab->GetTabTitle(&title));
-  ASSERT_STREQ(L"Title Of Awesomeness", title.c_str());
+  ASSERT_EQ(ASCIIToUTF16("Title Of Awesomeness"), title);
 }
 
 TEST_F(AutomationProxyTest, GetCurrentURL) {
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
   scoped_refptr<TabProxy> tab(window->GetTab(0));
   ASSERT_TRUE(tab.get());
   GURL url;
   ASSERT_TRUE(tab->GetCurrentURL(&url));
   ASSERT_STREQ("about:blank", url.spec().c_str());
@@ skipping 33 matching lines @@
   ASSERT_TRUE(window->ActivateTab(1));
   ASSERT_TRUE(window->GetActiveTabIndex(&active_tab_index));
   ASSERT_EQ(1, active_tab_index);
 }
 
 TEST_F(AutomationProxyTest2, GetTabTitle) {
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
   scoped_refptr<TabProxy> tab(window->GetTab(0));
   ASSERT_TRUE(tab.get());
-  std::wstring title;
+  string16 title;
   ASSERT_TRUE(tab->GetTabTitle(&title));
-  ASSERT_STREQ(L"title1.html", title.c_str());
+  ASSERT_EQ(ASCIIToUTF16("title1.html"), title);
 
   tab = window->GetTab(1);
   ASSERT_TRUE(tab.get());
   ASSERT_TRUE(tab->GetTabTitle(&title));
-  ASSERT_STREQ(L"Title Of Awesomeness", title.c_str());
+  ASSERT_EQ(ASCIIToUTF16("Title Of Awesomeness"), title);
 }
 
 TEST_F(AutomationProxyTest, Cookies) {
   GURL url("http://mojo.jojo.google.com");
   std::string value_result;
 
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
 
   scoped_refptr<TabProxy> tab(window->GetTab(0));
@@ skipping 106 matching lines @@
   return jscript;
 }
 
 TEST_F(AutomationProxyTest4, StringValueIsEchoedByDomAutomationController) {
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
 
   scoped_refptr<TabProxy> tab(window->GetTab(0));
   ASSERT_TRUE(tab.get());
 
-  std::wstring expected(L"string");
-  std::wstring jscript = CreateJSString(L"\"" + expected + L"\"");
-  std::wstring actual;
-  ASSERT_TRUE(tab->ExecuteAndExtractString(L"", jscript, &actual));
-  ASSERT_STREQ(expected.c_str(), actual.c_str());
+  string16 expected = ASCIIToUTF16("string");
+  string16 jscript = WideToUTF16Hack(
+      CreateJSString(L"\"" + UTF16ToWideHack(expected) + L"\""));
+  string16 actual;
+  ASSERT_TRUE(tab->ExecuteAndExtractString(string16(), jscript, &actual));
+  ASSERT_EQ(expected, actual);
 }
 
 std::wstring BooleanToString(bool bool_value) {
   Value* value = Value::CreateBooleanValue(bool_value);
   std::string json_string;
   JSONStringValueSerializer serializer(&json_string);
   serializer.Serialize(*value);
   return UTF8ToWide(json_string);
 }
 
 TEST_F(AutomationProxyTest4, BooleanValueIsEchoedByDomAutomationController) {
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
 
   scoped_refptr<TabProxy> tab(window->GetTab(0));
   ASSERT_TRUE(tab.get());
 
   bool expected = true;
   std::wstring jscript = CreateJSString(BooleanToString(expected));
   bool actual = false;
-  ASSERT_TRUE(tab->ExecuteAndExtractBool(L"", jscript, &actual));
+  ASSERT_TRUE(tab->ExecuteAndExtractBool(string16(),
+                                         WideToUTF16Hack(jscript),
+                                         &actual));
   ASSERT_EQ(expected, actual);
 }
 
 TEST_F(AutomationProxyTest4, NumberValueIsEchoedByDomAutomationController) {
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
 
   scoped_refptr<TabProxy> tab(window->GetTab(0));
   ASSERT_TRUE(tab.get());
 
   int expected = 1;
   int actual = 0;
   std::wstring expected_string;
   base::SStringPrintf(&expected_string, L"%d", expected);
   std::wstring jscript = CreateJSString(expected_string);
-  ASSERT_TRUE(tab->ExecuteAndExtractInt(L"", jscript, &actual));
+  ASSERT_TRUE(tab->ExecuteAndExtractInt(string16(),
+                                        WideToUTF16Hack(jscript),
+                                        &actual));
   ASSERT_EQ(expected, actual);
 }
 
 // TODO(vibhor): Add a test for ExecuteAndExtractValue() for JSON Dictionary
 // type value
 
 class AutomationProxyTest3 : public UITest {
  protected:
   AutomationProxyTest3() : UITest() {
     document1_ = test_data_directory_;
@@ skipping 16 matching lines @@
   return jscript;
 }
 
 TEST_F(AutomationProxyTest3, FrameDocumentCanBeAccessed) {
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
 
   scoped_refptr<TabProxy> tab(window->GetTab(0));
   ASSERT_TRUE(tab.get());
 
-  std::wstring actual;
-  std::wstring xpath1 = L"";  // top level frame
+  string16 actual;
+  string16 xpath1 = ASCIIToUTF16("");  // top level frame
   std::wstring jscript1 = CreateJSStringForDOMQuery(L"myinput");
-  ASSERT_TRUE(tab->ExecuteAndExtractString(xpath1, jscript1, &actual));
-  ASSERT_EQ(L"INPUT", actual);
+  ASSERT_TRUE(tab->ExecuteAndExtractString(xpath1,
+                                           WideToUTF16Hack(jscript1),
+                                           &actual));
+  ASSERT_EQ(ASCIIToUTF16("INPUT"), actual);
 
-  std::wstring xpath2 = L"/html/body/iframe";
+  string16 xpath2 = ASCIIToUTF16("/html/body/iframe");
   std::wstring jscript2 = CreateJSStringForDOMQuery(L"myspan");
-  ASSERT_TRUE(tab->ExecuteAndExtractString(xpath2, jscript2, &actual));
-  ASSERT_EQ(L"SPAN", actual);
+  ASSERT_TRUE(tab->ExecuteAndExtractString(xpath2,
+                                           WideToUTF16Hack(jscript2),
+                                           &actual));
+  ASSERT_EQ(ASCIIToUTF16("SPAN"), actual);
 
-  std::wstring xpath3 = L"/html/body/iframe\n/html/body/iframe";
+  string16 xpath3 = ASCIIToUTF16("/html/body/iframe\n/html/body/iframe");
   std::wstring jscript3 = CreateJSStringForDOMQuery(L"mydiv");
-  ASSERT_TRUE(tab->ExecuteAndExtractString(xpath3, jscript3, &actual));
-  ASSERT_EQ(L"DIV", actual);
+  ASSERT_TRUE(tab->ExecuteAndExtractString(xpath3,
+                                           WideToUTF16Hack(jscript3),
+                                           &actual));
+  ASSERT_EQ(ASCIIToUTF16("DIV"), actual);
 }
 
 // Flaky, http://crbug.com/70937
 TEST_F(AutomationProxyTest, FLAKY_BlockedPopupTest) {
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
 
   scoped_refptr<TabProxy> tab(window->GetTab(0));
   ASSERT_TRUE(tab.get());
 
@@ skipping 858 matching lines @@
             ui::MessageBoxFlags::DIALOGBUTTON_CANCEL, button);
 
   // Click OK.
   EXPECT_TRUE(automation()->ClickAppModalDialogButton(
       ui::MessageBoxFlags::DIALOGBUTTON_OK));
   EXPECT_TRUE(automation()->GetShowingAppModalDialog(&modal_dialog_showing,
                                                      &button));
   EXPECT_FALSE(modal_dialog_showing);
   int result = -1;
   EXPECT_TRUE(tab->ExecuteAndExtractInt(
-      std::wstring(),
-      L"window.domAutomationController.send(result);", &result));
+      string16(),
+      ASCIIToUTF16("window.domAutomationController.send(result);"),
+      &result));
   EXPECT_EQ(0, result);
 
   // Try again.
   ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
             tab->NavigateToURL(GURL(content)));
   EXPECT_TRUE(automation()->WaitForAppModalDialog());
   EXPECT_TRUE(automation()->GetShowingAppModalDialog(&modal_dialog_showing,
                                                      &button));
   EXPECT_TRUE(modal_dialog_showing);
   EXPECT_EQ(ui::MessageBoxFlags::DIALOGBUTTON_OK |
             ui::MessageBoxFlags::DIALOGBUTTON_CANCEL, button);
 
   // Click Cancel this time.
   EXPECT_TRUE(automation()->ClickAppModalDialogButton(
       ui::MessageBoxFlags::DIALOGBUTTON_CANCEL));
   EXPECT_TRUE(automation()->GetShowingAppModalDialog(&modal_dialog_showing,
                                                      &button));
   EXPECT_FALSE(modal_dialog_showing);
   EXPECT_TRUE(tab->ExecuteAndExtractInt(
-      std::wstring(),
-      L"window.domAutomationController.send(result);", &result));
+      string16(),
+      ASCIIToUTF16("window.domAutomationController.send(result);"),
+      &result));
   EXPECT_EQ(1, result);
 }
 
 class AutomationProxyTest5 : public UITest {
  protected:
   AutomationProxyTest5() {
     show_window_ = true;
     dom_automation_enabled_ = true;
     // We need to disable popup blocking to ensure that the RenderView
     // instance for the popup actually closes.
@@ skipping 10 matching lines @@
 
   FilePath filename(test_data_directory_);
   filename = filename.AppendASCII("dom_automation_test_with_popup.html");
 
   ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
             tab->NavigateToURL(net::FilePathToFileURL(filename)));
 
   // Allow some time for the popup to show up and close.
   base::PlatformThread::Sleep(TestTimeouts::action_timeout_ms());
 
-  std::wstring expected(L"string");
-  std::wstring jscript = CreateJSString(L"\"" + expected + L"\"");
-  std::wstring actual;
-  ASSERT_TRUE(tab->ExecuteAndExtractString(L"", jscript, &actual));
+  string16 expected(ASCIIToUTF16("string"));
+  std::wstring jscript =
+      CreateJSString(L"\"" + UTF16ToWideHack(expected) + L"\"");
+  string16 actual;
+  ASSERT_TRUE(tab->ExecuteAndExtractString(string16(),
+                                           WideToUTF16Hack(jscript),
+                                           &actual));
   ASSERT_EQ(expected, actual);
 }
 
 class AutomationProxySnapshotTest : public UITest {
  protected:
   AutomationProxySnapshotTest() {
     dom_automation_enabled_ = true;
     if (!snapshot_dir_.CreateUniqueTempDir())
       ADD_FAILURE() << "Unable to create temporary directory";
     else
@@ skipping 168 matching lines @@
   int diff_pixels_count = 0;
   for (int x = 0; x < img_size.width(); ++x) {
     for (int y = 0; y < img_size.height(); ++y) {
       if (*snapshot_bmp.getAddr32(x, y) != *reference_bmp.getAddr32(x, y)) {
         ++diff_pixels_count;
       }
     }
   }
   ASSERT_EQ(diff_pixels_count, 0);
 }