Simplify ExecuteJavaScript* functions.

chrome/browser/extensions/web_view_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/utf_string_conversions.h"
 #include "chrome/browser/automation/automation_util.h"
 #include "chrome/browser/extensions/platform_app_browsertest_util.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chrome/test/base/test_launcher_utils.h"
@@ skipping 180 matching lines @@
   }
 
   void ExecuteScriptWaitForTitle(content::WebContents* web_contents,
                                  const char* script,
                                  const char* title) {
     string16 expected_title(ASCIIToUTF16(title));
     string16 error_title(ASCIIToUTF16("error"));
 
     content::TitleWatcher title_watcher(web_contents, expected_title);
     title_watcher.AlsoWaitForTitle(error_title);
-    EXPECT_TRUE(content::ExecuteJavaScript(web_contents->GetRenderViewHost(),
-                                           "", script));
+    EXPECT_TRUE(content::ExecuteScript(web_contents, script));
     EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
   }
 };
 
 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim) {
   ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(WebViewTest, ShimSrcAttribute) {
   ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view_src_attribute"))
@@ skipping 28 matching lines @@
   // between partitions within the same app.
   content::WebContents* cookie_contents1;
   content::WebContents* cookie_contents2;
   content::WebContents* named_partition_contents1;
   content::WebContents* named_partition_contents2;
 
   NavigateAndOpenAppForIsolation(set_cookie_url, &cookie_contents1,
                                  &cookie_contents2, &named_partition_contents1,
                                  &named_partition_contents2, NULL, NULL, NULL);
 
-  EXPECT_TRUE(content::ExecuteJavaScript(
-      cookie_contents1->GetRenderViewHost(), "", cookie_script1));
-  EXPECT_TRUE(content::ExecuteJavaScript(
-      cookie_contents2->GetRenderViewHost(), "", cookie_script2));
+  EXPECT_TRUE(content::ExecuteScript(cookie_contents1, cookie_script1));
+  EXPECT_TRUE(content::ExecuteScript(cookie_contents2, cookie_script2));
 
   int cookie_size;
   std::string cookie_value;
 
   // Test the regular browser context to ensure we have only one cookie.
   automation_util::GetCookies(GURL("http://localhost"),
                               chrome::GetWebContentsAt(browser(), 0),
                               &cookie_size, &cookie_value);
   EXPECT_EQ("testCookie=1", cookie_value);
 
@@ skipping 48 matching lines @@
   content::WebContents* persistent_partition_contents2;
   content::WebContents* persistent_partition_contents3;
   NavigateAndOpenAppForIsolation(blank_url, &cookie_contents1,
                                  &cookie_contents2, &named_partition_contents1,
                                  &named_partition_contents2,
                                  &persistent_partition_contents1,
                                  &persistent_partition_contents2,
                                  &persistent_partition_contents3);
 
   // Set the inmemory=true cookie for tags with inmemory partitions.
-  EXPECT_TRUE(content::ExecuteJavaScript(
-      cookie_contents1->GetRenderViewHost(),
-      "",
-      cookie_script1));
-  EXPECT_TRUE(content::ExecuteJavaScript(
-      named_partition_contents1->GetRenderViewHost(),
-      "",
-      cookie_script1));
+  EXPECT_TRUE(content::ExecuteScript(cookie_contents1, cookie_script1));
+  EXPECT_TRUE(content::ExecuteScript(named_partition_contents1,
+                                     cookie_script1));
 
   // For the two different persistent storage partitions, set the
   // two different cookies so we can check that they aren't comingled below.
-  EXPECT_TRUE(content::ExecuteJavaScript(
-      persistent_partition_contents1->GetRenderViewHost(),
-      "",
-      cookie_script2));
+  EXPECT_TRUE(content::ExecuteScript(persistent_partition_contents1,
+                                     cookie_script2));
 
-  EXPECT_TRUE(content::ExecuteJavaScript(
-      persistent_partition_contents3->GetRenderViewHost(),
-      "",
-      cookie_script3));
+  EXPECT_TRUE(content::ExecuteScript(persistent_partition_contents3,
+                                     cookie_script3));
 
   int cookie_size;
   std::string cookie_value;
 
   // Check that all in-memory partitions have a cookie set.
   automation_util::GetCookies(GURL("http://localhost"),
                               cookie_contents1,
                               &cookie_size, &cookie_value);
   EXPECT_EQ("inmemory=true", cookie_value);
   automation_util::GetCookies(GURL("http://localhost"),
@@ skipping 103 matching lines @@
   content::WebContents* default_tag_contents2;
   content::WebContents* storage_contents1;
   content::WebContents* storage_contents2;
 
   NavigateAndOpenAppForIsolation(regular_url, &default_tag_contents1,
                                  &default_tag_contents2, &storage_contents1,
                                  &storage_contents2, NULL, NULL, NULL);
 
   // Initialize the storage for the first of the two tags that share a storage
   // partition.
-  EXPECT_TRUE(content::ExecuteJavaScript(
-      storage_contents1->GetRenderViewHost(),
-      "",
-      "initDomStorage('page1')"));
+  EXPECT_TRUE(content::ExecuteScript(storage_contents1,
+                                     "initDomStorage('page1')"));
 
   // Let's test that the expected values are present in the first tag, as they
   // will be overwritten once we call the initDomStorage on the second tag.
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-      storage_contents1->GetRenderViewHost(),
-      "",
-      get_local_storage.c_str(),
-      &output));
+  EXPECT_TRUE(ExecuteScriptAndExtractString(storage_contents1,
+                                            get_local_storage.c_str(),
+                                            &output));
   EXPECT_STREQ("local-page1", output.c_str());
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-      storage_contents1->GetRenderViewHost(),
-      "",
-      get_session_storage.c_str(),
-      &output));
+  EXPECT_TRUE(ExecuteScriptAndExtractString(storage_contents1,
+                                            get_session_storage.c_str(),
+                                            &output));
   EXPECT_STREQ("session-page1", output.c_str());
 
   // Now, init the storage in the second tag in the same storage partition,
   // which will overwrite the shared localStorage.
-  EXPECT_TRUE(content::ExecuteJavaScript(
-      storage_contents2->GetRenderViewHost(),
-      "",
-      "initDomStorage('page2')"));
+  EXPECT_TRUE(content::ExecuteScript(storage_contents2,
+                                     "initDomStorage('page2')"));
 
   // The localStorage value now should reflect the one written through the
   // second tag.
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-      storage_contents1->GetRenderViewHost(),
-      "",
-      get_local_storage.c_str(),
-      &output));
+  EXPECT_TRUE(ExecuteScriptAndExtractString(storage_contents1,
+                                            get_local_storage.c_str(),
+                                            &output));
   EXPECT_STREQ("local-page2", output.c_str());
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-      storage_contents2->GetRenderViewHost(),
-      "",
-      get_local_storage.c_str(),
-      &output));
+  EXPECT_TRUE(ExecuteScriptAndExtractString(storage_contents2,
+                                            get_local_storage.c_str(),
+                                            &output));
   EXPECT_STREQ("local-page2", output.c_str());
 
   // Session storage is not shared though, as each webview tag has separate
   // instance, even if they are in the same storage partition.
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-      storage_contents1->GetRenderViewHost(),
-      "",
-      get_session_storage.c_str(),
-      &output));
+  EXPECT_TRUE(ExecuteScriptAndExtractString(storage_contents1,
+                                            get_session_storage.c_str(),
+                                            &output));
   EXPECT_STREQ("session-page1", output.c_str());
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-      storage_contents2->GetRenderViewHost(),
-      "",
-      get_session_storage.c_str(),
-      &output));
+  EXPECT_TRUE(ExecuteScriptAndExtractString(storage_contents2,
+                                            get_session_storage.c_str(),
+                                            &output));
   EXPECT_STREQ("session-page2", output.c_str());
 
   // Also, let's check that the main browser and another tag that doesn't share
   // the same partition don't have those values stored.
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-      chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractString(
+      chrome::GetWebContentsAt(browser(), 0),
       get_local_storage.c_str(),
       &output));
   EXPECT_STREQ("badval", output.c_str());
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-      chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(ExecuteScriptAndExtractString(
+      chrome::GetWebContentsAt(browser(), 0),
       get_session_storage.c_str(),
       &output));
   EXPECT_STREQ("badval", output.c_str());
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-      default_tag_contents1->GetRenderViewHost(),
-      "",
-      get_local_storage.c_str(),
-      &output));
+  EXPECT_TRUE(ExecuteScriptAndExtractString(default_tag_contents1,
+                                            get_local_storage.c_str(),
+                                            &output));
   EXPECT_STREQ("badval", output.c_str());
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-      default_tag_contents1->GetRenderViewHost(),
-      "",
-      get_session_storage.c_str(),
-      &output));
+  EXPECT_TRUE(ExecuteScriptAndExtractString(default_tag_contents1,
+                                            get_session_storage.c_str(),
+                                            &output));
   EXPECT_STREQ("badval", output.c_str());
 }
 
 // This tests IndexedDB isolation for packaged apps with webview tags. It loads
 // an app with multiple webview tags and each tag creates an IndexedDB record,
 // which the test checks to ensure proper storage isolation is enforced.
 IN_PROC_BROWSER_TEST_F(WebViewTest, IndexedDBIsolation) {
   ASSERT_TRUE(StartTestServer());
   GURL regular_url = test_server()->GetURL("files/title1.html");
 
@@ skipping 11 matching lines @@
   ExecuteScriptWaitForTitle(storage_contents1, "initIDB()", "idb created");
   ExecuteScriptWaitForTitle(storage_contents1, "addItemIDB(7, 'page1')",
                             "addItemIDB complete");
   ExecuteScriptWaitForTitle(storage_contents1, "readItemIDB(7)",
                             "readItemIDB complete");
 
   std::string output;
   std::string get_value(
       "window.domAutomationController.send(getValueIDB() || 'badval')");
 
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-      storage_contents1->GetRenderViewHost(),
-      "",
-      get_value.c_str(), &output));
+  EXPECT_TRUE(ExecuteScriptAndExtractString(storage_contents1,
+                                            get_value.c_str(), &output));
   EXPECT_STREQ("page1", output.c_str());
 
   // Initialize the db in the second tag.
   ExecuteScriptWaitForTitle(storage_contents2, "initIDB()", "idb open");
 
   // Since we share a partition, reading the value should return the existing
   // one.
   ExecuteScriptWaitForTitle(storage_contents2, "readItemIDB(7)",
                             "readItemIDB complete");
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-      storage_contents2->GetRenderViewHost(),
-      "",
-      get_value.c_str(), &output));
+  EXPECT_TRUE(ExecuteScriptAndExtractString(storage_contents2,
+                                            get_value.c_str(), &output));
   EXPECT_STREQ("page1", output.c_str());
 
   // Now write through the second tag and read it back.
   ExecuteScriptWaitForTitle(storage_contents2, "addItemIDB(7, 'page2')",
                             "addItemIDB complete");
   ExecuteScriptWaitForTitle(storage_contents2, "readItemIDB(7)",
                             "readItemIDB complete");
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-      storage_contents2->GetRenderViewHost(),
-      "",
-      get_value.c_str(), &output));
+  EXPECT_TRUE(ExecuteScriptAndExtractString(storage_contents2,
+                                            get_value.c_str(), &output));
   EXPECT_STREQ("page2", output.c_str());
 
   // Reset the document title, otherwise the next call will not see a change and
   // will hang waiting for it.
-  EXPECT_TRUE(content::ExecuteJavaScript(
-      storage_contents1->GetRenderViewHost(),
-      "",
-      "document.title = 'foo'"));
+  EXPECT_TRUE(content::ExecuteScript(storage_contents1,
+                                     "document.title = 'foo'"));
 
   // Read through the first tag to ensure we have the second value.
   ExecuteScriptWaitForTitle(storage_contents1, "readItemIDB(7)",
                             "readItemIDB complete");
-  EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
-      storage_contents1->GetRenderViewHost(),
-      "",
-      get_value.c_str(),
-      &output));
+  EXPECT_TRUE(ExecuteScriptAndExtractString(storage_contents1,
+                                            get_value.c_str(), &output));
   EXPECT_STREQ("page2", output.c_str());
 
   // Now, let's confirm there is no database in the main browser and another
   // tag that doesn't share the same partition. Due to the IndexedDB API design,
   // open will succeed, but the version will be 1, since it creates the database
   // if it is not found. The two tags use database version 3, so we avoid
   // ambiguity.
   const char* script =
       "indexedDB.open('isolation').onsuccess = function(e) {"
       "  if (e.target.result.version == 1)"
       "    document.title = 'db not found';"
       "  else "
       "    document.title = 'error';"
       "}";
   ExecuteScriptWaitForTitle(chrome::GetWebContentsAt(browser(), 0),
                             script, "db not found");
   ExecuteScriptWaitForTitle(default_tag_contents1, script, "db not found");
 }