Simplify ExecuteJavaScript* functions.

chrome/browser/extensions/chrome_app_api_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 <string>
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
@@ skipping 15 matching lines @@
 using extensions::Extension;
 
 class ChromeAppAPITest : public ExtensionBrowserTest {
  protected:
   bool IsAppInstalled() { return IsAppInstalled(""); }
   bool IsAppInstalled(const char* frame_xpath) {
     const char kGetAppIsInstalled[] =
         "window.domAutomationController.send(window.chrome.app.isInstalled);";
     bool result;
     CHECK(
-        content::ExecuteJavaScriptAndExtractBool(
-            chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-            frame_xpath, kGetAppIsInstalled, &result));
+        content::ExecuteScriptInFrameAndExtractBool(
+            chrome::GetActiveWebContents(browser()),
+            frame_xpath,
+            kGetAppIsInstalled,
+            &result));
     return result;
   }
 
   std::string InstallState() { return InstallState(""); }
   std::string InstallState(const char* frame_xpath) {
     const char kGetAppInstallState[] =
         "window.chrome.app.installState("
         "    function(s) { window.domAutomationController.send(s); });";
     std::string result;
     CHECK(
-        content::ExecuteJavaScriptAndExtractString(
-            chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-            frame_xpath, kGetAppInstallState, &result));
+        content::ExecuteScriptInFrameAndExtractString(
+            chrome::GetActiveWebContents(browser()),
+            frame_xpath,
+            kGetAppInstallState,
+            &result));
     return result;
   }
 
   std::string RunningState() { return RunningState(""); }
   std::string RunningState(const char* frame_xpath) {
     const char kGetAppRunningState[] =
         "window.domAutomationController.send("
         "    window.chrome.app.runningState());";
     std::string result;
     CHECK(
-        content::ExecuteJavaScriptAndExtractString(
-            chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-            frame_xpath, kGetAppRunningState, &result));
+        content::ExecuteScriptInFrameAndExtractString(
+            chrome::GetActiveWebContents(browser()),
+            frame_xpath,
+            kGetAppRunningState,
+            &result));
     return result;
   }
 
  private:
   virtual void SetUpCommandLine(CommandLine* command_line) {
     ExtensionBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitchASCII(switches::kAppsCheckoutURL,
                                     "http://checkout.com:");
   }
 };
@@ skipping 31 matching lines @@
   // Test that a non-app page has chrome.app.isInstalled = false.
   ui_test_utils::NavigateToURL(browser(), non_app_url);
   EXPECT_FALSE(IsAppInstalled());
 
   // Test that a non-app page returns null for chrome.app.getDetails().
   const char kGetAppDetails[] =
       "window.domAutomationController.send("
       "    JSON.stringify(window.chrome.app.getDetails()));";
   std::string result;
   ASSERT_TRUE(
-      content::ExecuteJavaScriptAndExtractString(
-          chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-          "",
+      content::ExecuteScriptAndExtractString(
+          chrome::GetActiveWebContents(browser()),
           kGetAppDetails,
           &result));
   EXPECT_EQ("null", result);
 
   // Check that an app page has chrome.app.isInstalled = true.
   ui_test_utils::NavigateToURL(browser(), app_url);
   EXPECT_TRUE(IsAppInstalled());
 
   // Check that an app page returns the correct result for
   // chrome.app.getDetails().
   ui_test_utils::NavigateToURL(browser(), app_url);
   ASSERT_TRUE(
-      content::ExecuteJavaScriptAndExtractString(
-          chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-          "",
+      content::ExecuteScriptAndExtractString(
+          chrome::GetActiveWebContents(browser()),
           kGetAppDetails,
           &result));
   scoped_ptr<DictionaryValue> app_details(
       static_cast<DictionaryValue*>(base::JSONReader::Read(result)));
   // extension->manifest() does not contain the id.
   app_details->Remove("id", NULL);
   EXPECT_TRUE(app_details.get());
   EXPECT_TRUE(app_details->Equals(extension->manifest()->value()));
 
   // Try to change app.isInstalled.  Should silently fail, so
   // that isInstalled should have the initial value.
   ASSERT_TRUE(
-      content::ExecuteJavaScriptAndExtractString(
-          chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-          "",
+      content::ExecuteScriptAndExtractString(
+          chrome::GetActiveWebContents(browser()),
           "window.domAutomationController.send("
           "    function() {"
           "        var value = window.chrome.app.isInstalled;"
           "        window.chrome.app.isInstalled = !value;"
           "        if (window.chrome.app.isInstalled == value) {"
           "            return 'true';"
           "        } else {"
           "            return 'false';"
           "        }"
           "    }()"
@@ skipping 28 matching lines @@
   const Extension* extension = LoadExtension(
       test_data_dir_.AppendASCII("app_dot_com_app"));
   ASSERT_TRUE(extension);
 
   // Test that normal pages (even apps) cannot use getDetailsForFrame().
   ui_test_utils::NavigateToURL(browser(), app_url);
   const char kTestUnsuccessfulAccess[] =
       "window.domAutomationController.send(window.testUnsuccessfulAccess())";
   bool result = false;
   ASSERT_TRUE(
-      content::ExecuteJavaScriptAndExtractBool(
-          chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-          "",
+      content::ExecuteScriptAndExtractBool(
+          chrome::GetActiveWebContents(browser()),
           kTestUnsuccessfulAccess,
           &result));
   EXPECT_TRUE(result);
 
   // Test that checkout can use getDetailsForFrame() and that it works
   // correctly.
   ui_test_utils::NavigateToURL(browser(), checkout_url);
   const char kGetDetailsForFrame[] =
       "window.domAutomationController.send("
       "    JSON.stringify(chrome.app.getDetailsForFrame(frames[0])))";
   std::string json;
   ASSERT_TRUE(
-      content::ExecuteJavaScriptAndExtractString(
-          chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-          "",
+      content::ExecuteScriptAndExtractString(
+          chrome::GetActiveWebContents(browser()),
           kGetDetailsForFrame,
           &json));
 
   scoped_ptr<DictionaryValue> app_details(
       static_cast<DictionaryValue*>(base::JSONReader::Read(json)));
   // extension->manifest() does not contain the id.
   app_details->Remove("id", NULL);
   EXPECT_TRUE(app_details.get());
   EXPECT_TRUE(app_details->Equals(extension->manifest()->value()));
 }
@@ skipping 84 matching lines @@
   GURL non_app_url(test_file_url.ReplaceComponents(replace_host));
 
   // Check the install and running state of a non-app iframe running
   // within an app.
   ui_test_utils::NavigateToURL(browser(), app_url);
 
   EXPECT_EQ("not_installed", InstallState("//html/iframe[1]"));
   EXPECT_EQ("cannot_run", RunningState("//html/iframe[1]"));
   EXPECT_FALSE(IsAppInstalled("//html/iframe[1]"));
 }