Change ExecuteJavaScript* helper functions in browser_test_utils.{h,cc}

content/browser/browser_plugin/browser_plugin_host_browsertest.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 "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
@@ skipping 256 matching lines @@
     SimulateKeyPress(web_contents,
                      ui::VKEY_TAB,
                      false,   // control.
                      false,   // shift.
                      false,   // alt.
                      false);  // command.
   }
 
   // Executes the javascript synchronously and makes sure the returned value is
   // freed properly.
-  void ExecuteSyncJSFunction(RenderViewHost* rvh, const string16& jscript) {
+  void ExecuteSyncJSFunction(RenderViewHost* rvh, const std::string& jscript) {
     scoped_ptr<base::Value> value(rvh->ExecuteJavascriptAndGetValue(
-        string16(), jscript));
+        string16(), UTF8ToUTF16(jscript)));
   }
 
   // This helper method does the following:
   // 1. Start the test server and navigate the shell to |embedder_url|.
   // 2. Execute custom pre-navigation |embedder_code| if provided.
   // 3. Navigate the guest to the |guest_url|.
   // 4. Verify that the guest has been created and has completed loading.
   void StartBrowserPluginTest(const std::string& embedder_url,
                               const std::string& guest_url,
                               bool is_guest_data_url,
                               const std::string& embedder_code) {
     ASSERT_TRUE(test_server()->Start());
     GURL test_url(test_server()->GetURL(embedder_url));
     NavigateToURL(shell(), test_url);
 
     WebContentsImpl* embedder_web_contents = static_cast<WebContentsImpl*>(
         shell()->web_contents());
     RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
         embedder_web_contents->GetRenderViewHost());
     // Focus the embedder.
     rvh->Focus();
 
     // Allow the test to do some operations on the embedder before we perform
     // the first navigation of the guest.
     if (!embedder_code.empty())
-      ExecuteSyncJSFunction(rvh, ASCIIToUTF16(embedder_code));
+      ExecuteSyncJSFunction(rvh, embedder_code);
 
     if (!is_guest_data_url) {
       test_url = test_server()->GetURL(guest_url);
-      ExecuteSyncJSFunction(rvh,
-          ASCIIToUTF16(StringPrintf("SetSrc('%s');", test_url.spec().c_str())));
+      ExecuteSyncJSFunction(
+          rvh, StringPrintf("SetSrc('%s');", test_url.spec().c_str()));
     } else {
-      ExecuteSyncJSFunction(rvh,
-          ASCIIToUTF16(StringPrintf("SetSrc('%s');", guest_url.c_str())));
+      ExecuteSyncJSFunction(
+          rvh, StringPrintf("SetSrc('%s');", guest_url.c_str()));
     }
 
     // Wait to make sure embedder is created/attached to WebContents.
     TestBrowserPluginHostFactory::GetInstance()->WaitForEmbedderCreation();
 
     test_embedder_ = static_cast<TestBrowserPluginEmbedder*>(
         embedder_web_contents->GetBrowserPluginEmbedder());
     ASSERT_TRUE(test_embedder_);
     test_embedder_->WaitForGuestAdded();
 
@@ skipping 35 matching lines @@
   const char kEmbedderURL[] =
       "files/browser_plugin_embedder_guest_unresponsive.html";
   StartBrowserPluginTest(kEmbedderURL, kHTMLForGuestBusyLoop, true, "");
   // Wait until the busy loop starts.
   {
     const string16 expected_title = ASCIIToUTF16("start");
     content::TitleWatcher title_watcher(test_guest()->web_contents(),
                                         expected_title);
     // Hang the guest for a length of time.
     int spin_time = 10 * TestTimeouts::tiny_timeout().InMilliseconds();
-    ExecuteSyncJSFunction(test_guest()->web_contents()->GetRenderViewHost(),
-        ASCIIToUTF16(StringPrintf("StartPauseMs(%d);", spin_time).c_str()));
+    ExecuteSyncJSFunction(
+        test_guest()->web_contents()->GetRenderViewHost(),
+        StringPrintf("StartPauseMs(%d);", spin_time).c_str());
 
     string16 actual_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(expected_title, actual_title);
   }
   {
     const string16 expected_title = ASCIIToUTF16("done");
     content::TitleWatcher title_watcher(test_embedder()->web_contents(),
                                         expected_title);
 
     // Send a mouse event to the guest.
@@ skipping 122 matching lines @@
 }
 
 // This test verifies that hiding the embedder also hides the guest.
 IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, BrowserPluginVisibilityChanged) {
   const char kEmbedderURL[] = "files/browser_plugin_embedder.html";
   StartBrowserPluginTest(kEmbedderURL, kHTMLForGuest, true, "");
 
   // Hide the Browser Plugin.
   RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
       test_embedder()->web_contents()->GetRenderViewHost());
-  ExecuteSyncJSFunction(rvh, ASCIIToUTF16(
-      "document.getElementById('plugin').style.visibility = 'hidden'"));
+  ExecuteSyncJSFunction(
+      rvh, "document.getElementById('plugin').style.visibility = 'hidden'");
 
   // Make sure that the guest is hidden.
   test_guest()->WaitUntilHidden();
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, EmbedderVisibilityChanged) {
   const char kEmbedderURL[] = "files/browser_plugin_embedder.html";
   StartBrowserPluginTest(kEmbedderURL, kHTMLForGuest, true, "");
 
   // Hide the embedder.
   test_embedder()->web_contents()->WasHidden();
 
   // Make sure that hiding the embedder also hides the guest.
   test_guest()->WaitUntilHidden();
 }
 
 // This test verifies that calling the reload method reloads the guest.
 IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, ReloadGuest) {
   const char kEmbedderURL[] = "files/browser_plugin_embedder.html";
   StartBrowserPluginTest(kEmbedderURL, kHTMLForGuest, true, "");
 
   test_guest()->ResetUpdateRectCount();
 
   RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
       test_embedder()->web_contents()->GetRenderViewHost());
-  ExecuteSyncJSFunction(rvh, ASCIIToUTF16(
-      "document.getElementById('plugin').reload()"));
+  ExecuteSyncJSFunction(rvh, "document.getElementById('plugin').reload()");
   test_guest()->WaitForReload();
 }
 
 // This test verifies that calling the stop method forwards the stop request
 // to the guest's WebContents.
 IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, StopGuest) {
   const char kEmbedderURL[] = "files/browser_plugin_embedder.html";
   StartBrowserPluginTest(kEmbedderURL, kHTMLForGuest, true, "");
 
   RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
       test_embedder()->web_contents()->GetRenderViewHost());
-  ExecuteSyncJSFunction(rvh, ASCIIToUTF16(
-      "document.getElementById('plugin').stop()"));
+  ExecuteSyncJSFunction(rvh, "document.getElementById('plugin').stop()");
   test_guest()->WaitForStop();
 }
 
 // Verifies that installing/uninstalling touch-event handlers in the guest
 // plugin correctly updates the touch-event handling state in the embedder.
 IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, AcceptTouchEvents) {
   const char kEmbedderURL[] = "files/browser_plugin_embedder.html";
   StartBrowserPluginTest(kEmbedderURL, kHTMLForGuestTouchHandler, true, "");
 
   RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
       test_embedder()->web_contents()->GetRenderViewHost());
   // The embedder should not have any touch event handlers at this point.
   EXPECT_FALSE(rvh->has_touch_handler());
 
   // Install the touch handler in the guest. This should cause the embedder to
   // start listening for touch events too.
   RenderViewHostMessageObserver observer(rvh,
       ViewHostMsg_HasTouchEventHandlers::ID);
   ExecuteSyncJSFunction(test_guest()->web_contents()->GetRenderViewHost(),
-                        ASCIIToUTF16("InstallTouchHandler();"));
+                        "InstallTouchHandler();");
   observer.WaitUntilMessageReceived();
   EXPECT_TRUE(rvh->has_touch_handler());
 
   // Uninstalling the touch-handler in guest should cause the embedder to stop
   // listening for touch events.
   observer.ResetState();
   ExecuteSyncJSFunction(test_guest()->web_contents()->GetRenderViewHost(),
-                        ASCIIToUTF16("UninstallTouchHandler();"));
+                        "UninstallTouchHandler();");
   observer.WaitUntilMessageReceived();
   EXPECT_FALSE(rvh->has_touch_handler());
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, Renavigate) {
   const char kEmbedderURL[] = "files/browser_plugin_embedder.html";
   StartBrowserPluginTest(
       kEmbedderURL, GetHTMLForGuestWithTitle("P1"), true, "");
   RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
       test_embedder()->web_contents()->GetRenderViewHost());
 
   // Navigate to P2 and verify that the navigation occurred.
   {
     const string16 expected_title = ASCIIToUTF16("P2");
     content::TitleWatcher title_watcher(test_guest()->web_contents(),
                                         expected_title);
 
-    ExecuteSyncJSFunction(rvh, ASCIIToUTF16(StringPrintf("SetSrc('%s');",
-        GetHTMLForGuestWithTitle("P2").c_str())));
+    ExecuteSyncJSFunction(
+        rvh,
+        StringPrintf("SetSrc('%s');", GetHTMLForGuestWithTitle("P2").c_str()));
 
     string16 actual_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(expected_title, actual_title);
   }
 
   // Navigate to P3 and verify that the navigation occurred.
   {
     const string16 expected_title = ASCIIToUTF16("P3");
     content::TitleWatcher title_watcher(test_guest()->web_contents(),
                                         expected_title);
 
-    ExecuteSyncJSFunction(rvh, ASCIIToUTF16(StringPrintf("SetSrc('%s');",
-        GetHTMLForGuestWithTitle("P3").c_str())));
+    ExecuteSyncJSFunction(
+        rvh,
+        StringPrintf("SetSrc('%s');", GetHTMLForGuestWithTitle("P3").c_str()));
 
     string16 actual_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(expected_title, actual_title);
   }
 
   // Go back and verify that we're back at P2.
   {
     const string16 expected_title = ASCIIToUTF16("P2");
     content::TitleWatcher title_watcher(test_guest()->web_contents(),
                                         expected_title);
 
-    ExecuteSyncJSFunction(rvh, ASCIIToUTF16("Back();"));
+    ExecuteSyncJSFunction(rvh, "Back();");
     string16 actual_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(expected_title, actual_title);
 
     scoped_ptr<base::Value> value(rvh->ExecuteJavascriptAndGetValue(string16(),
         ASCIIToUTF16("CanGoBack()")));
     bool result = false;
     ASSERT_TRUE(value->GetAsBoolean(&result));
     EXPECT_TRUE(result);
 
     value.reset(rvh->ExecuteJavascriptAndGetValue(string16(),
         ASCIIToUTF16("CanGoForward()")));
     result = false;
     ASSERT_TRUE(value->GetAsBoolean(&result));
     EXPECT_TRUE(result);
   }
 
   // Go forward and verify that we're back at P3.
   {
     const string16 expected_title = ASCIIToUTF16("P3");
     content::TitleWatcher title_watcher(test_guest()->web_contents(),
                                         expected_title);
 
-    ExecuteSyncJSFunction(rvh, ASCIIToUTF16("Forward();"));
+    ExecuteSyncJSFunction(rvh, "Forward();");
     string16 actual_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(expected_title, actual_title);
 
     scoped_ptr<base::Value> value(rvh->ExecuteJavascriptAndGetValue(string16(),
         ASCIIToUTF16("CanGoForward()")));
     bool result = true;
     ASSERT_TRUE(value->GetAsBoolean(&result));
     EXPECT_FALSE(result);
   }
 
   // Go back two entries and verify that we're back at P1.
   {
     const string16 expected_title = ASCIIToUTF16("P1");
     content::TitleWatcher title_watcher(test_guest()->web_contents(),
                                         expected_title);
 
-    ExecuteSyncJSFunction(rvh, ASCIIToUTF16("Go(-2);"));
+    ExecuteSyncJSFunction(rvh, "Go(-2);");
     string16 actual_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(expected_title, actual_title);
 
     scoped_ptr<base::Value> value(rvh->ExecuteJavascriptAndGetValue(string16(),
         ASCIIToUTF16("CanGoBack()")));
     bool result = true;
     ASSERT_TRUE(value->GetAsBoolean(&result));
     EXPECT_FALSE(result);
   }
 }
 
 // This tests verifies that reloading the embedder does not crash the browser
 // and that the guest is reset.
 IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, ReloadEmbedder) {
   const char kEmbedderURL[] = "files/browser_plugin_embedder.html";
   StartBrowserPluginTest(kEmbedderURL, kHTMLForGuest, true, "");
   RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
       test_embedder()->web_contents()->GetRenderViewHost());
 
   // Change the title of the page to 'modified' so that we know that
   // the page has successfully reloaded when it goes back to 'embedder'
   // in the next step.
   {
     const string16 expected_title = ASCIIToUTF16("modified");
     content::TitleWatcher title_watcher(test_embedder()->web_contents(),
                                         expected_title);
 
-    ExecuteSyncJSFunction(rvh, ASCIIToUTF16(StringPrintf("SetTitle('%s');",
-        "modified")));
+    ExecuteSyncJSFunction(rvh, StringPrintf("SetTitle('%s');", "modified"));
 
     string16 actual_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(expected_title, actual_title);
   }
 
   // Reload the embedder page, and verify that the reload was successful.
   // Then navigate the guest to verify that the browser process does not crash.
   {
     const string16 expected_title = ASCIIToUTF16("embedder");
     content::TitleWatcher title_watcher(test_embedder()->web_contents(),
                                         expected_title);
 
     test_embedder()->web_contents()->GetController().Reload(false);
     string16 actual_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(expected_title, actual_title);
 
-    ExecuteSyncJSFunction(test_embedder()->web_contents()->GetRenderViewHost(),
-        ASCIIToUTF16(StringPrintf("SetSrc('%s');", kHTMLForGuest)));
+    ExecuteSyncJSFunction(
+        test_embedder()->web_contents()->GetRenderViewHost(),
+        StringPrintf("SetSrc('%s');", kHTMLForGuest));
 
     const BrowserPluginEmbedder::ContainerInstanceMap& instance_map =
         test_embedder()->guest_web_contents_for_testing();
     WebContentsImpl* test_guest_web_contents = static_cast<WebContentsImpl*>(
         instance_map.begin()->second);
     TestBrowserPluginGuest* new_test_guest =
         static_cast<TestBrowserPluginGuest*>(
           test_guest_web_contents->GetBrowserPluginGuest());
 
     // Wait for the guest to send an UpdateRectMsg, meaning it is ready.
     new_test_guest->WaitForUpdateRectMsg();
   }
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, TerminateGuest) {
   const char kEmbedderURL[] = "files/browser_plugin_embedder.html";
   StartBrowserPluginTest(kEmbedderURL, kHTMLForGuest, true, "");
 
   RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
       test_embedder()->web_contents()->GetRenderViewHost());
-  ExecuteSyncJSFunction(rvh, ASCIIToUTF16(
-      "document.getElementById('plugin').terminate()"));
+  ExecuteSyncJSFunction(rvh, "document.getElementById('plugin').terminate()");
 
   // Expect the guest to crash.
   test_guest()->WaitForExit();
 }
 
 // This test verifies that the guest is responsive after crashing and going back
 // to a previous navigation entry.
 IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, BackAfterTerminateGuest) {
   const char* kEmbedderURL = "files/browser_plugin_embedder.html";
   StartBrowserPluginTest(
       kEmbedderURL, GetHTMLForGuestWithTitle("P1"), true, "");
   RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
       test_embedder()->web_contents()->GetRenderViewHost());
 
   // Navigate to P2 and verify that the navigation occurred.
   {
     const string16 expected_title = ASCIIToUTF16("P2");
     content::TitleWatcher title_watcher(test_guest()->web_contents(),
                                         expected_title);
 
-    ExecuteSyncJSFunction(rvh, ASCIIToUTF16(StringPrintf("SetSrc('%s');",
-        GetHTMLForGuestWithTitle("P2").c_str())));
+    ExecuteSyncJSFunction(
+        rvh,
+        StringPrintf("SetSrc('%s');", GetHTMLForGuestWithTitle("P2").c_str()));
 
     string16 actual_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(expected_title, actual_title);
   }
   // Kill the guest.
-  ExecuteSyncJSFunction(rvh,
-      ASCIIToUTF16("document.getElementById('plugin').terminate()"));
+  ExecuteSyncJSFunction(rvh, "document.getElementById('plugin').terminate()");
 
   // Expect the guest to report that it crashed.
   test_guest()->WaitForExit();
   // Go back and verify that we're back at P1.
   {
     const string16 expected_title = ASCIIToUTF16("P1");
     content::TitleWatcher title_watcher(test_guest()->web_contents(),
                                         expected_title);
 
-    ExecuteSyncJSFunction(rvh, ASCIIToUTF16("Back();"));
+    ExecuteSyncJSFunction(rvh, "Back();");
 
     string16 actual_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(expected_title, actual_title);
   }
   // Send an input event and verify that the guest receives the input.
   SimulateMouseClick(test_embedder()->web_contents(), 0,
       WebKit::WebMouseEvent::ButtonLeft);
   test_guest()->WaitForInput();
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, LoadStart) {
   const char kEmbedderURL[] = "files/browser_plugin_embedder.html";
   StartBrowserPluginTest(kEmbedderURL, "about:blank", true, "");
 
   const string16 expected_title = ASCIIToUTF16(kHTMLForGuest);
   content::TitleWatcher title_watcher(test_embedder()->web_contents(),
                                       expected_title);
   // Renavigate the guest to |kHTMLForGuest|.
   RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
       test_embedder()->web_contents()->GetRenderViewHost());
-  ExecuteSyncJSFunction(rvh, ASCIIToUTF16(
-      StringPrintf("SetSrc('%s');", kHTMLForGuest)));
+  ExecuteSyncJSFunction(rvh, StringPrintf("SetSrc('%s');", kHTMLForGuest));
 
   string16 actual_title = title_watcher.WaitAndGetTitle();
   EXPECT_EQ(expected_title, actual_title);
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, LoadAbort) {
   const char kEmbedderURL[] = "files/browser_plugin_embedder.html";
   StartBrowserPluginTest(kEmbedderURL, "about:blank", true, "");
 
   {
     // Navigate the guest to "close-socket".
     const string16 expected_title = ASCIIToUTF16("ERR_EMPTY_RESPONSE");
     content::TitleWatcher title_watcher(test_embedder()->web_contents(),
                                         expected_title);
     RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
         test_embedder()->web_contents()->GetRenderViewHost());
     GURL test_url = test_server()->GetURL("close-socket");
-    ExecuteSyncJSFunction(rvh, ASCIIToUTF16(
-        StringPrintf("SetSrc('%s');", test_url.spec().c_str())));
+    ExecuteSyncJSFunction(
+        rvh, StringPrintf("SetSrc('%s');", test_url.spec().c_str()));
     string16 actual_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(expected_title, actual_title);
   }
 
   {
     // Navigate the guest to an illegal chrome:// URL.
     const string16 expected_title = ASCIIToUTF16("ERR_FAILED");
     content::TitleWatcher title_watcher(test_embedder()->web_contents(),
                                         expected_title);
     RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
         test_embedder()->web_contents()->GetRenderViewHost());
     GURL test_url("chrome://newtab");
-    ExecuteSyncJSFunction(rvh, ASCIIToUTF16(
-        StringPrintf("SetSrc('%s');", test_url.spec().c_str())));
+    ExecuteSyncJSFunction(
+        rvh, StringPrintf("SetSrc('%s');", test_url.spec().c_str()));
     string16 actual_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(expected_title, actual_title);
   }
 
   {
     // Navigate the guest to an illegal file:// URL.
     const string16 expected_title = ASCIIToUTF16("ERR_ABORTED");
     content::TitleWatcher title_watcher(test_embedder()->web_contents(),
                                         expected_title);
     RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
         test_embedder()->web_contents()->GetRenderViewHost());
     GURL test_url("file://foo");
-    ExecuteSyncJSFunction(rvh, ASCIIToUTF16(
-        StringPrintf("SetSrc('%s');", test_url.spec().c_str())));
+    ExecuteSyncJSFunction(
+        rvh, StringPrintf("SetSrc('%s');", test_url.spec().c_str()));
     string16 actual_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(expected_title, actual_title);
   }
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, LoadRedirect) {
   const char kEmbedderURL[] = "files/browser_plugin_embedder.html";
   StartBrowserPluginTest(kEmbedderURL, "about:blank", true, "");
 
   const string16 expected_title = ASCIIToUTF16("redirected");
   content::TitleWatcher title_watcher(test_embedder()->web_contents(),
                                       expected_title);
 
   // Navigate with a redirect and wait until the title changes.
   GURL redirect_url(test_server()->GetURL(
       "server-redirect?files/title1.html"));
   RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
       test_embedder()->web_contents()->GetRenderViewHost());
-  ExecuteSyncJSFunction(rvh, ASCIIToUTF16(
-      StringPrintf("SetSrc('%s');", redirect_url.spec().c_str())));
+  ExecuteSyncJSFunction(
+      rvh, StringPrintf("SetSrc('%s');", redirect_url.spec().c_str()));
 
   string16 actual_title = title_watcher.WaitAndGetTitle();
   EXPECT_EQ(expected_title, actual_title);
 
   // Verify that we heard a loadRedirect during the navigation.
   scoped_ptr<base::Value> value(rvh->ExecuteJavascriptAndGetValue(
       string16(), ASCIIToUTF16("redirectOldUrl")));
   std::string result;
   EXPECT_TRUE(value->GetAsString(&result));
   EXPECT_EQ(redirect_url.spec().c_str(), result);
@@ skipping 68 matching lines @@
   StartBrowserPluginTest(kEmbedderURL, kGuestURL, false, "");
   RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
       test_embedder()->web_contents()->GetRenderViewHost());
   {
     const string16 expected_title = ASCIIToUTF16("main guest");
     content::TitleWatcher title_watcher(test_embedder()->web_contents(),
                                         expected_title);
 
     // By the time we get here 'contentWindow' should be ready because the
     // guest has completed loading.
-    ExecuteSyncJSFunction(rvh,
-        ASCIIToUTF16(StringPrintf("PostMessage('%s, false');", kTesting)));
+    ExecuteSyncJSFunction(
+        rvh, StringPrintf("PostMessage('%s, false');", kTesting));
 
     // The title will be updated to "main guest" at the last stage of the
     // process described above.
     string16 actual_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(expected_title, actual_title);
   }
 }
 
 // This is the same as BrowserPluginHostTest.PostMessage but also
 // posts a message to an iframe.
 // TODO(fsamuel): This test should replace the previous test once postMessage
 // iframe targeting is fixed (see http://crbug.com/153701).
 IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, DISABLED_PostMessageToIFrame) {
   const char* kTesting = "testing123";
   const char* kEmbedderURL = "files/browser_plugin_embedder.html";
   const char* kGuestURL = "files/browser_plugin_post_message_guest.html";
   StartBrowserPluginTest(kEmbedderURL, kGuestURL, false, "");
   RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
       test_embedder()->web_contents()->GetRenderViewHost());
   {
     const string16 expected_title = ASCIIToUTF16("main guest");
     content::TitleWatcher title_watcher(test_embedder()->web_contents(),
                                         expected_title);
 
-    ExecuteSyncJSFunction(rvh,
-        ASCIIToUTF16(StringPrintf("PostMessage('%s, false');", kTesting)));
+    ExecuteSyncJSFunction(
+        rvh, StringPrintf("PostMessage('%s, false');", kTesting));
 
     // The title will be updated to "main guest" at the last stage of the
     // process described above.
     string16 actual_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(expected_title, actual_title);
   }
   {
     content::TitleWatcher ready_watcher(test_embedder()->web_contents(),
                                         ASCIIToUTF16("ready"));
 
     RenderViewHostImpl* guest_rvh = static_cast<RenderViewHostImpl*>(
         test_guest()->web_contents()->GetRenderViewHost());
     GURL test_url = test_server()->GetURL(
         "files/browser_plugin_post_message_guest.html");
-    ExecuteSyncJSFunction(guest_rvh,
-        ASCIIToUTF16(StringPrintf("CreateChildFrame('%s');",
-                                  test_url.spec().c_str())));
+    ExecuteSyncJSFunction(
+        guest_rvh,
+        StringPrintf("CreateChildFrame('%s');", test_url.spec().c_str()));
 
     string16 actual_title = ready_watcher.WaitAndGetTitle();
     EXPECT_EQ(ASCIIToUTF16("ready"), actual_title);
 
     content::TitleWatcher iframe_watcher(test_embedder()->web_contents(),
                                         ASCIIToUTF16("iframe"));
-    ExecuteSyncJSFunction(rvh,
-        ASCIIToUTF16(StringPrintf("PostMessage('%s', true);", kTesting)));
+    ExecuteSyncJSFunction(
+        rvh, StringPrintf("PostMessage('%s', true);", kTesting));
 
     // The title will be updated to "iframe" at the last stage of the
     // process described above.
     actual_title = iframe_watcher.WaitAndGetTitle();
     EXPECT_EQ(ASCIIToUTF16("iframe"), actual_title);
   }
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, LoadStop) {
   const char* kEmbedderURL = "files/browser_plugin_embedder.html";
   StartBrowserPluginTest(kEmbedderURL, "about:blank", true, "");
 
   const string16 expected_title = ASCIIToUTF16("loadStop");
   content::TitleWatcher title_watcher(
      test_embedder()->web_contents(), expected_title);
   // Renavigate the guest to |kHTMLForGuest|.
   RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
       test_embedder()->web_contents()->GetRenderViewHost());
-  ExecuteSyncJSFunction(rvh, ASCIIToUTF16(
-      StringPrintf("SetSrc('%s');", kHTMLForGuest)));
+  ExecuteSyncJSFunction(rvh, StringPrintf("SetSrc('%s');", kHTMLForGuest));
 
   string16 actual_title = title_watcher.WaitAndGetTitle();
   EXPECT_EQ(expected_title, actual_title);
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, LoadCommit) {
   const char* kEmbedderURL = "files/browser_plugin_embedder.html";
   StartBrowserPluginTest(kEmbedderURL, "about:blank", true, "");
 
   const string16 expected_title = ASCIIToUTF16(
       StringPrintf("loadCommit:%s", kHTMLForGuest));
   content::TitleWatcher title_watcher(
       test_embedder()->web_contents(), expected_title);
   // Renavigate the guest to |kHTMLForGuest|.
   RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
       test_embedder()->web_contents()->GetRenderViewHost());
-  ExecuteSyncJSFunction(rvh, ASCIIToUTF16(
-      StringPrintf("SetSrc('%s');", kHTMLForGuest)));
+  ExecuteSyncJSFunction(rvh, StringPrintf("SetSrc('%s');", kHTMLForGuest));
 
   string16 actual_title = title_watcher.WaitAndGetTitle();
   EXPECT_EQ(expected_title, actual_title);
   scoped_ptr<base::Value> is_top_level(rvh->ExecuteJavascriptAndGetValue(
       string16(), ASCIIToUTF16("commitIsTopLevel")));
   bool top_level_bool = false;
   EXPECT_TRUE(is_top_level->GetAsBoolean(&top_level_bool));
   EXPECT_EQ(true, top_level_bool);
 }
 
@@ skipping 12 matching lines @@
 // the new guest will inherit the visibility state of the old guest.
 //
 // Very flaky on Linux, Linux CrOS, somewhat flaky on XP, slightly on
 // Mac; http://crbug.com/162809.
 IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, DISABLED_VisibilityPreservation) {
   const char* kEmbedderURL = "files/browser_plugin_embedder.html";
   StartBrowserPluginTest(kEmbedderURL, kHTMLForGuest, true, "");
   RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
       test_embedder()->web_contents()->GetRenderViewHost());
   // Hide the BrowserPlugin.
-  ExecuteSyncJSFunction(rvh, ASCIIToUTF16(
-      "document.getElementById('plugin').style.visibility = 'hidden';"));
+  ExecuteSyncJSFunction(
+      rvh, "document.getElementById('plugin').style.visibility = 'hidden';");
   test_guest()->WaitUntilHidden();
   // Kill the current guest.
-  ExecuteSyncJSFunction(rvh, ASCIIToUTF16(
-      "document.getElementById('plugin').terminate();"));
+  ExecuteSyncJSFunction(rvh, "document.getElementById('plugin').terminate();");
   test_guest()->WaitForExit();
   // Get a new guest.
-  ExecuteSyncJSFunction(rvh, ASCIIToUTF16(
-      "document.getElementById('plugin').reload();"));
+  ExecuteSyncJSFunction(rvh, "document.getElementById('plugin').reload();");
   test_guest()->WaitForLoadStop();
   // Verify that the guest is told to hide.
   test_guest()->WaitUntilHidden();
 }
 
 // This test verifies that if a browser plugin is focused before navigation then
 // the guest starts off focused.
 IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, FocusBeforeNavigation) {
   const char* kEmbedderURL = "files/browser_plugin_embedder.html";
   const std::string embedder_code =
@@ skipping 16 matching lines @@
 IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, FocusPreservation) {
   const char* kEmbedderURL = "files/browser_plugin_embedder.html";
   StartBrowserPluginTest(kEmbedderURL, kHTMLForGuest, true, "");
   RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
       test_embedder()->web_contents()->GetRenderViewHost());
   RenderViewHostImpl* guest_rvh = static_cast<RenderViewHostImpl*>(
       test_guest()->web_contents()->GetRenderViewHost());
   {
     // Focus the BrowserPlugin. This will have the effect of also focusing the
     // current guest.
-    ExecuteSyncJSFunction(
-        rvh, ASCIIToUTF16("document.getElementById('plugin').focus();"));
+    ExecuteSyncJSFunction(rvh, "document.getElementById('plugin').focus();");
     // Verify that key presses go to the guest.
     SimulateSpaceKeyPress(test_embedder()->web_contents());
     test_guest()->WaitForInput();
     // Verify that the guest is focused.
     scoped_ptr<base::Value> value(
         guest_rvh->ExecuteJavascriptAndGetValue(string16(),
             ASCIIToUTF16("document.hasFocus()")));
     bool result = false;
     ASSERT_TRUE(value->GetAsBoolean(&result));
     EXPECT_TRUE(result);
   }
 
   // Kill the current guest.
-  ExecuteSyncJSFunction(rvh, ASCIIToUTF16(
-      "document.getElementById('plugin').terminate();"));
+  ExecuteSyncJSFunction(rvh, "document.getElementById('plugin').terminate();");
   test_guest()->WaitForExit();
 
   {
     // Get a new guest.
-    ExecuteSyncJSFunction(rvh, ASCIIToUTF16(
-        "document.getElementById('plugin').reload();"));
+    ExecuteSyncJSFunction(rvh, "document.getElementById('plugin').reload();");
     test_guest()->WaitForLoadStop();
     // Verify that the guest is focused.
     scoped_ptr<base::Value> value(
         guest_rvh->ExecuteJavascriptAndGetValue(string16(),
             ASCIIToUTF16("document.hasFocus()")));
     bool result = false;
     ASSERT_TRUE(value->GetAsBoolean(&result));
     EXPECT_TRUE(result);
   }
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, FocusTracksEmbedder) {
   const char* kEmbedderURL = "files/browser_plugin_embedder.html";
   StartBrowserPluginTest(kEmbedderURL, kHTMLForGuest, true, "");
   RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
       test_embedder()->web_contents()->GetRenderViewHost());
   RenderViewHostImpl* guest_rvh = static_cast<RenderViewHostImpl*>(
       test_guest()->web_contents()->GetRenderViewHost());
   {
     // Focus the BrowserPlugin. This will have the effect of also focusing the
     // current guest.
-    ExecuteSyncJSFunction(
-        rvh, ASCIIToUTF16("document.getElementById('plugin').focus();"));
+    ExecuteSyncJSFunction(rvh, "document.getElementById('plugin').focus();");
     // Verify that key presses go to the guest.
     SimulateSpaceKeyPress(test_embedder()->web_contents());
     test_guest()->WaitForInput();
     // Verify that the guest is focused.
     scoped_ptr<base::Value> value(
         guest_rvh->ExecuteJavascriptAndGetValue(string16(),
             ASCIIToUTF16("document.hasFocus()")));
     bool result = false;
     ASSERT_TRUE(value->GetAsBoolean(&result));
     EXPECT_TRUE(result);
@@ skipping 25 matching lines @@
   const char* kEmbedderURL = "files/browser_plugin_embedder.html";
   StartBrowserPluginTest(
       kEmbedderURL, kHTMLForGuestWithSize, true, "");
   RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
       test_embedder()->web_contents()->GetRenderViewHost());
 
   {
     const string16 expected_title = ASCIIToUTF16("AutoSize(300, 400)");
     content::TitleWatcher title_watcher(test_embedder()->web_contents(),
                                         expected_title);
-    ExecuteSyncJSFunction(rvh, ASCIIToUTF16(
+    ExecuteSyncJSFunction(
+        rvh,
         "document.getElementById('plugin').minWidth = 300;"
         "document.getElementById('plugin').minHeight = 200;"
         "document.getElementById('plugin').maxWidth = 600;"
         "document.getElementById('plugin').maxHeight = 400;"
-        "document.getElementById('plugin').autoSize = true;"));
+        "document.getElementById('plugin').autoSize = true;");
     string16 actual_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(expected_title, actual_title);
   }
   {
     // Change the minWidth and verify that it causes relayout.
     const string16 expected_title = ASCIIToUTF16("AutoSize(350, 400)");
     content::TitleWatcher title_watcher(test_embedder()->web_contents(),
                                         expected_title);
-    ExecuteSyncJSFunction(rvh, ASCIIToUTF16(
-        "document.getElementById('plugin').minWidth = 350;"));
+    ExecuteSyncJSFunction(
+        rvh, "document.getElementById('plugin').minWidth = 350;");
     string16 actual_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(expected_title, actual_title);
   }
   {
     // Turn off autoSize and verify that the guest resizes to fit the container.
-    ExecuteSyncJSFunction(rvh, ASCIIToUTF16(
-        "document.getElementById('plugin').autoSize = false;"));
+    ExecuteSyncJSFunction(
+        rvh, "document.getElementById('plugin').autoSize = false;");
     test_guest()->WaitForViewSize(gfx::Size(640, 480));
   }
 }
 
 // Test for regression http://crbug.com/162961.
 IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, GetRenderViewHostAtPositionTest) {
   const char kEmbedderURL[] = "files/browser_plugin_embedder.html";
   const std::string embedder_code = StringPrintf("SetSize(%d, %d);", 100, 100);
   StartBrowserPluginTest(kEmbedderURL, kHTMLForGuestWithSize, true,
                          embedder_code);
   // Check for render view host at position (150, 150) that is outside the
   // bounds of our guest, so this would respond with the render view host of the
   // embedder.
   test_embedder()->WaitForRenderViewHostAtPosition(150, 150);
   ASSERT_EQ(test_embedder()->web_contents()->GetRenderViewHost(),
             test_embedder()->last_rvh_at_position_response());
 }
 
 }  // namespace content