Simplify ExecuteJavaScript* functions.

chrome/browser/extensions/isolated_app_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/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/automation/automation_util.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/base/mock_host_resolver.h"
 
-using content::ExecuteJavaScript;
-using content::ExecuteJavaScriptAndExtractString;
+using content::ExecuteScript;
+using content::ExecuteScriptAndExtractString;
 using content::NavigationController;
 using content::WebContents;
 using content::RenderViewHost;
 
 namespace {
 
 std::string WrapForJavascriptAndExtract(const char* javascript_expression) {
   return std::string("window.domAutomationController.send(") +
       javascript_expression + ")";
 }
@@ skipping 71 matching lines @@
 
   // We also need to test script-initialized navigation (document.location.href)
   // happened after page finishes loading. This one will also triggered the
   // willPerformClientRedirect hook in RenderViewImpl but should not replace
   // the previous history entry.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), base_url.Resolve("non_app/main.html"),
       NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
 
   WebContents* tab0 = chrome::GetWebContentsAt(browser(), 1);
-  RenderViewHost* rvh = tab0->GetRenderViewHost();
 
   // Using JavaScript to navigate to app2 page,
   // after the non_app page has finished loading.
   content::WindowedNotificationObserver observer1(
       content::NOTIFICATION_LOAD_STOP,
       content::Source<NavigationController>(
           &chrome::GetActiveWebContents(browser())->GetController()));
   std::string script = base::StringPrintf(
         "document.location.href=\"%s\";",
         base_url.Resolve("app2/main.html").spec().c_str());
-  EXPECT_TRUE(ExecuteJavaScript(rvh, "", script));
+  EXPECT_TRUE(ExecuteScript(tab0, script));
   observer1.Wait();
 
   // This kind of navigation should not replace previous navigation entry.
   EXPECT_TRUE(chrome::CanGoBack(browser()));
   chrome::GoBack(browser(), CURRENT_TAB);
   EXPECT_FALSE(chrome::CanGoBack(browser()));
 }
 
 // Tests that cookies set within an isolated app are not visible to normal
 // pages or other apps.
@@ skipping 31 matching lines @@
   // Ensure first two tabs have installed apps.
   WebContents* tab0 = chrome::GetWebContentsAt(browser(), 0);
   WebContents* tab1 = chrome::GetWebContentsAt(browser(), 1);
   WebContents* tab2 = chrome::GetWebContentsAt(browser(), 2);
   ASSERT_TRUE(GetInstalledApp(tab0));
   ASSERT_TRUE(GetInstalledApp(tab1));
   ASSERT_TRUE(!GetInstalledApp(tab2));
 
   // Check that tabs see cannot each other's localStorage even though they are
   // in the same origin.
-  RenderViewHost* app1_rvh = tab0->GetRenderViewHost();
-  RenderViewHost* app2_rvh = tab1->GetRenderViewHost();
-  RenderViewHost* non_app_rvh = tab2->GetRenderViewHost();
-  ASSERT_TRUE(ExecuteJavaScript(
-      app1_rvh, "", "window.localStorage.setItem('testdata', 'ls_app1');"));
-  ASSERT_TRUE(ExecuteJavaScript(
-      app2_rvh, "", "window.localStorage.setItem('testdata', 'ls_app2');"));
-  ASSERT_TRUE(ExecuteJavaScript(
-      non_app_rvh,
-      "",
-      "window.localStorage.setItem('testdata', 'ls_normal');"));
+  ASSERT_TRUE(ExecuteScript(
+      tab0, "window.localStorage.setItem('testdata', 'ls_app1');"));
+  ASSERT_TRUE(ExecuteScript(
+      tab1, "window.localStorage.setItem('testdata', 'ls_app2');"));
+  ASSERT_TRUE(ExecuteScript(
+      tab2, "window.localStorage.setItem('testdata', 'ls_normal');"));
 
   const std::string& kRetrieveLocalStorage =
       WrapForJavascriptAndExtract(
           "window.localStorage.getItem('testdata') || 'badval'");
   std::string result;
-  ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-      app1_rvh, "", kRetrieveLocalStorage.c_str(), &result));
+  ASSERT_TRUE(ExecuteScriptAndExtractString(
+      tab0, kRetrieveLocalStorage.c_str(), &result));
   EXPECT_EQ("ls_app1", result);
-  ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-      app2_rvh, "", kRetrieveLocalStorage.c_str(), &result));
+  ASSERT_TRUE(ExecuteScriptAndExtractString(
+      tab1, kRetrieveLocalStorage.c_str(), &result));
   EXPECT_EQ("ls_app2", result);
-  ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-      non_app_rvh, "", kRetrieveLocalStorage.c_str(), &result));
+  ASSERT_TRUE(ExecuteScriptAndExtractString(
+      tab2, kRetrieveLocalStorage.c_str(), &result));
   EXPECT_EQ("ls_normal", result);
 
   // Check that each tab sees its own cookie.
   EXPECT_TRUE(HasCookie(tab0, "app1=3"));
   EXPECT_TRUE(HasCookie(tab1, "app2=4"));
   EXPECT_TRUE(HasCookie(tab2, "normalPage=5"));
 
   // Check that app1 tab cannot see the other cookies.
   EXPECT_FALSE(HasCookie(tab0, "app2"));
   EXPECT_FALSE(HasCookie(tab0, "normalPage"));
@@ skipping 59 matching lines @@
   EXPECT_TRUE(HasCookie(chrome::GetWebContentsAt(browser(), 0), "nonAppFrame=6"));
   EXPECT_TRUE(HasCookie(chrome::GetWebContentsAt(browser(), 1), "app1=3"));
   EXPECT_TRUE(HasCookie(chrome::GetWebContentsAt(browser(), 1), "normalPage=5"));
   EXPECT_TRUE(HasCookie(chrome::GetWebContentsAt(browser(), 1), "nonAppFrame=6"));
   EXPECT_TRUE(HasCookie(chrome::GetWebContentsAt(browser(), 2), "app1=3"));
   EXPECT_TRUE(HasCookie(chrome::GetWebContentsAt(browser(), 2), "app2=4"));
   EXPECT_TRUE(HasCookie(chrome::GetWebContentsAt(browser(), 2), "nonAppFrame=6"));
 
   // Check that all tabs share the same localStorage if they have the same
   // origin.
-  RenderViewHost* app1_rvh =
-      chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost();
-  RenderViewHost* app2_rvh =
-      chrome::GetWebContentsAt(browser(), 1)->GetRenderViewHost();
-  RenderViewHost* non_app_rvh =
-      chrome::GetWebContentsAt(browser(), 2)->GetRenderViewHost();
-  ASSERT_TRUE(ExecuteJavaScript(
-      app1_rvh, "", "window.localStorage.setItem('testdata', 'ls_app1');"));
-  ASSERT_TRUE(ExecuteJavaScript(
-      app2_rvh, "", "window.localStorage.setItem('testdata', 'ls_app2');"));
-  ASSERT_TRUE(ExecuteJavaScript(
-      non_app_rvh,
-      "",
-      "window.localStorage.setItem('testdata', 'ls_normal');"));
+  WebContents* app1_wc = chrome::GetWebContentsAt(browser(), 0);
+  WebContents* app2_wc = chrome::GetWebContentsAt(browser(), 1);
+  WebContents* non_app_wc = chrome::GetWebContentsAt(browser(), 2);
+  ASSERT_TRUE(ExecuteScript(
+      app1_wc, "window.localStorage.setItem('testdata', 'ls_app1');"));
+  ASSERT_TRUE(ExecuteScript(
+      app2_wc, "window.localStorage.setItem('testdata', 'ls_app2');"));
+  ASSERT_TRUE(ExecuteScript(
+      non_app_wc, "window.localStorage.setItem('testdata', 'ls_normal');"));
 
   const std::string& kRetrieveLocalStorage =
       WrapForJavascriptAndExtract("window.localStorage.getItem('testdata')");
   std::string result;
-  ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-      app1_rvh, "", kRetrieveLocalStorage.c_str(), &result));
+  ASSERT_TRUE(ExecuteScriptAndExtractString(
+      app1_wc, kRetrieveLocalStorage.c_str(), &result));
   EXPECT_EQ("ls_normal", result);
-  ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-      app2_rvh, "", kRetrieveLocalStorage.c_str(), &result));
+  ASSERT_TRUE(ExecuteScriptAndExtractString(
+      app2_wc, kRetrieveLocalStorage.c_str(), &result));
   EXPECT_EQ("ls_normal", result);
-  ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-      non_app_rvh, "", kRetrieveLocalStorage.c_str(), &result));
+  ASSERT_TRUE(ExecuteScriptAndExtractString(
+      non_app_wc, kRetrieveLocalStorage.c_str(), &result));
   EXPECT_EQ("ls_normal", result);
 }
 
 // Tests that subresource and media requests use the app's cookie store.
 // See http://crbug.com/141172.
 IN_PROC_BROWSER_TEST_F(IsolatedAppTest, SubresourceCookieIsolation) {
   host_resolver()->AddRule("*", "127.0.0.1");
   ASSERT_TRUE(test_server()->Start());
 
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app1")));
@@ skipping 127 matching lines @@
   GURL::Replacements replace_host;
   std::string host_str("localhost");  // Must stay in scope with replace_host.
   replace_host.SetHostStr(host_str);
   base_url = base_url.ReplaceComponents(replace_host);
 
   // Enter some state into sessionStorage three times on the same origin, but
   // for three URLs that correspond to app1, app2, and a non-isolated site.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), base_url.Resolve("app1/main.html"),
       CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
-  ASSERT_TRUE(ExecuteJavaScript(
-      chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(ExecuteScript(
+      chrome::GetWebContentsAt(browser(), 0),
       "window.sessionStorage.setItem('testdata', 'ss_app1');"));
 
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), base_url.Resolve("app2/main.html"),
       CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
-  ASSERT_TRUE(ExecuteJavaScript(
-      chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(ExecuteScript(
+      chrome::GetWebContentsAt(browser(), 0),
       "window.sessionStorage.setItem('testdata', 'ss_app2');"));
 
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), base_url.Resolve("non_app/main.html"),
       CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
-  ASSERT_TRUE(ExecuteJavaScript(
-      chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(ExecuteScript(
+      chrome::GetWebContentsAt(browser(), 0),
       "window.sessionStorage.setItem('testdata', 'ss_normal');"));
 
   // Now, ensure that the sessionStorage is correctly partitioned, and persists
   // when we navigate around all over the dang place.
   const std::string& kRetrieveSessionStorage =
       WrapForJavascriptAndExtract(
           "window.sessionStorage.getItem('testdata') || 'badval'");
   std::string result;
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), base_url.Resolve("app1/main.html"),
       CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
-  ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-      chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost(),
-      "", kRetrieveSessionStorage.c_str(), &result));
+  ASSERT_TRUE(ExecuteScriptAndExtractString(
+      chrome::GetWebContentsAt(browser(), 0),
+      kRetrieveSessionStorage.c_str(), &result));
   EXPECT_EQ("ss_app1", result);
 
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), base_url.Resolve("app2/main.html"),
       CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
-  ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-      chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost(),
-      "", kRetrieveSessionStorage.c_str(), &result));
+  ASSERT_TRUE(ExecuteScriptAndExtractString(
+      chrome::GetWebContentsAt(browser(), 0),
+      kRetrieveSessionStorage.c_str(), &result));
   EXPECT_EQ("ss_app2", result);
 
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), base_url.Resolve("non_app/main.html"),
       CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
-  ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-      chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost(),
-      "", kRetrieveSessionStorage.c_str(), &result));
+  ASSERT_TRUE(ExecuteScriptAndExtractString(
+      chrome::GetWebContentsAt(browser(), 0),
+      kRetrieveSessionStorage.c_str(), &result));
   EXPECT_EQ("ss_normal", result);
 }