Simplify ExecuteJavaScript* functions.

chrome/browser/policy/policy_prefs_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 <algorithm>
 #include <map>
 #include <sstream>
 #include <string>
 #include <vector>
 
@@ skipping 313 matching lines @@
              << "  indicator.readOnly = node.readOnly || false;"
              << "  indicator.visible ="
              << "      window.getComputedStyle(node).display != 'none';"
              << "  indicators.push(indicator)"
              << "}"
              << "domAutomationController.send(JSON.stringify(indicators));";
   content::WebContents* contents = chrome::GetActiveWebContents(browser);
   std::string json;
   // Retrieve the state of all controlled setting indicators matching the
   // |selector| as JSON.
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      contents->GetRenderViewHost(), "", javascript.str(), &json));
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(contents, javascript.str(),
+                                                     &json));
   scoped_ptr<base::Value> value_ptr(base::JSONReader::Read(json));
   const base::ListValue* indicators = NULL;
   ASSERT_TRUE(value_ptr.get());
   ASSERT_TRUE(value_ptr->GetAsList(&indicators));
   // Verify that controlled setting indicators representing |value| are visible
   // and have the correct state while those not representing |value| are
   // invisible.
   if (!controlled_by.empty()) {
     EXPECT_GT(indicators->GetSize(), 0u)
         << "Expected to find at least one controlled setting indicator.";
@@ skipping 138 matching lines @@
            pref_mapping = pref_mappings.begin();
        pref_mapping != pref_mappings.end();
        ++pref_mapping) {
     const ScopedVector<IndicatorTestCase>&
         indicator_test_cases = (*pref_mapping)->indicator_test_cases();
     if (indicator_test_cases.empty())
       continue;
 
     ui_test_utils::NavigateToURL(browser(), GURL(kMainSettingsPage));
     if (!(*pref_mapping)->indicator_test_setup_js().empty()) {
-      ASSERT_TRUE(content::ExecuteJavaScript(
-          chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-          "",
+      ASSERT_TRUE(content::ExecuteScript(
+          chrome::GetActiveWebContents(browser()),
           (*pref_mapping)->indicator_test_setup_js()));
     }
 
     std::string indicator_selector = (*pref_mapping)->indicator_selector();
     if (indicator_selector.empty())
       indicator_selector = "[pref=\"" + (*pref_mapping)->pref() + "\"]";
     for (ScopedVector<IndicatorTestCase>::const_iterator
              indicator_test_case = indicator_test_cases.begin();
          indicator_test_case != indicator_test_cases.end();
          ++indicator_test_case) {
@@ skipping 48 matching lines @@
   }
 }
 
 INSTANTIATE_TEST_CASE_P(
     PolicyPrefsTestInstance,
     PolicyPrefsTest,
     testing::ValuesIn(GetChromePolicyDefinitionList()->begin,
                       GetChromePolicyDefinitionList()->end));
 
 }  // namespace policy