Simplify ExecuteJavaScript* functions.

chrome/browser/autofill/autofill_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/basictypes.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 199 matching lines @@
     ui_test_utils::NavigateToURL(browser(), url);
 
     std::string js;
     for (FormMap::const_iterator i = data.begin(); i != data.end(); ++i) {
       js += "document.getElementById('" + i->first + "').value = '" +
             i->second + "';";
     }
     js += "document.getElementById('testform').submit();";
 
     WindowedPersonalDataManagerObserver observer(browser());
-    ASSERT_TRUE(
-        content::ExecuteJavaScript(render_view_host(), "", js));
+    ASSERT_TRUE(content::ExecuteScript(render_view_host(), js));
     observer.Wait();
   }
 
   void SubmitCreditCard(const char* name,
                         const char* number,
                         const char* exp_month,
                         const char* exp_year) {
     FormMap data;
     data["CREDIT_CARD_NAME"] = name;
     data["CREDIT_CARD_NUMBER"] = number;
     data["CREDIT_CARD_EXP_MONTH"] = exp_month;
     data["CREDIT_CARD_EXP_4_DIGIT_YEAR"] = exp_year;
     FillFormAndSubmit("autofill_creditcard_form.html", data);
   }
 
   // Populates a webpage form using autofill data and keypress events.
   // This function focuses the specified input field in the form, and then
   // sends keypress events to the tab to cause the form to be populated.
   void PopulateForm(const std::string& field_id) {
     std::string js("document.getElementById('" + field_id + "').focus();");
-    ASSERT_TRUE(
-        content::ExecuteJavaScript(render_view_host(), "", js));
+    ASSERT_TRUE(content::ExecuteScript(render_view_host(), js));
 
     SendKeyAndWait(ui::VKEY_DOWN,
                    chrome::NOTIFICATION_AUTOFILL_DID_SHOW_SUGGESTIONS);
     SendKeyAndWait(ui::VKEY_DOWN,
                    chrome::NOTIFICATION_AUTOFILL_DID_FILL_FORM_DATA);
     SendKeyAndWait(ui::VKEY_RETURN,
                    chrome::NOTIFICATION_AUTOFILL_DID_FILL_FORM_DATA);
   }
 
   // Aggregate profiles from forms into Autofill preferences. Returns the number
@@ skipping 31 matching lines @@
       data["PHONE_HOME_WHOLE_NUMBER"] = fields[11];
 
       FillFormAndSubmit("duplicate_profiles_test.html", data);
     }
     return lines.size();
   }
 
   void ExpectFieldValue(const std::string& field_name,
                         const std::string& expected_value) {
     std::string value;
-    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-        chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-        "",
+    ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+        chrome::GetActiveWebContents(browser()),
         "window.domAutomationController.send("
         "    document.getElementById('" + field_name + "').value);",
         &value));
     EXPECT_EQ(expected_value, value);
   }
 
   RenderViewHost* render_view_host() {
     return chrome::GetActiveWebContents(browser())->GetRenderViewHost();
   }
 
@@ skipping 37 matching lines @@
     fetcher->delegate()->OnURLFetchComplete(fetcher);
   }
 
   void FocusFirstNameField() {
     LOG(WARNING) << "Clicking on the tab.";
     content::SimulateMouseClick(chrome::GetActiveWebContents(browser()), 0,
         WebKit::WebMouseEvent::ButtonLeft);
 
     LOG(WARNING) << "Focusing the first name field.";
     bool result = false;
-    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
+    ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
         render_view_host(),
-        "",
         "if (document.readyState === 'complete')"
         "  document.getElementById('firstname').focus();"
         "else"
         "  domAutomationController.send(false);",
         &result));
     ASSERT_TRUE(result);
   }
 
   void ExpectFilledTestForm() {
     ExpectFieldValue("firstname", "Milton");
@@ skipping 164 matching lines @@
   // The form should be filled.
   ExpectFilledTestForm();
 
   // The change event should have already fired for unfocused fields, both of
   // <input> and of <select> type. However, it should not yet have fired for the
   // focused field.
   bool focused_fired = false;
   bool unfocused_fired = false;
   bool changed_select_fired = false;
   bool unchanged_select_fired = false;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
       render_view_host(),
-      "",
       "domAutomationController.send(focused_fired);",
       &focused_fired));
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
       render_view_host(),
-      "",
       "domAutomationController.send(unfocused_fired);",
       &unfocused_fired));
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
       render_view_host(),
-      "",
       "domAutomationController.send(changed_select_fired);",
       &changed_select_fired));
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
       render_view_host(),
-      "",
       "domAutomationController.send(unchanged_select_fired);",
       &unchanged_select_fired));
   EXPECT_FALSE(focused_fired);
   EXPECT_TRUE(unfocused_fired);
   EXPECT_TRUE(changed_select_fired);
   EXPECT_FALSE(unchanged_select_fired);
 
   // Unfocus the first name field. Its change event should fire.
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
       render_view_host(),
-      "",
       "document.getElementById('firstname').blur();"
       "domAutomationController.send(focused_fired);", &focused_fired));
   EXPECT_TRUE(focused_fired);
 }
 
 // Test that we can autofill forms distinguished only by their |id| attribute.
 // DISABLED: http://crbug.com/150084
 IN_PROC_BROWSER_TEST_F(AutofillTest, DISABLED_AutofillFormsDistinguishedById) {
   CreateTestProfile();
 
@@ skipping 192 matching lines @@
            ""
            "  for (var i = 0; i < elements.length; i++) {"
            "    var name = elements[i][0];"
            "    var label = elements[i][1];"
            "    AddElement(name, label);"
            "  }"
            "};"
            "</script>")));
 
   // Dynamically construct the form.
-  ASSERT_TRUE(content::ExecuteJavaScript(render_view_host(), "",
-                                         "BuildForm();"));
+  ASSERT_TRUE(content::ExecuteScript(render_view_host(), "BuildForm();"));
 
   // Invoke Autofill.
   TryBasicFormFill();
 }
 
 // Test that form filling works after reloading the current page.
 // This test brought to you by http://crbug.com/69204
 #if defined(OS_MACOSX)
 // Now flaky on everything but mac.
 // http://crbug.com/150084
@@ skipping 77 matching lines @@
   // Pass fake google.translate lib as the translate script.
   SimulateURLFetch(true);
 
   content::WindowedNotificationObserver translation_observer(
       chrome::NOTIFICATION_PAGE_TRANSLATED,
       content::NotificationService::AllSources());
 
   // Simulate translation to kick onTranslateElementLoad.
   // But right now, the call stucks here.
   // Once click the text field, it starts again.
-  ASSERT_TRUE(content::ExecuteJavaScript(
-      render_view_host(),
-      "",
-      "cr.googleTranslate.onTranslateElementLoad();"));
+  ASSERT_TRUE(content::ExecuteScript(
+      render_view_host(), "cr.googleTranslate.onTranslateElementLoad();"));
 
   // Simulate the render notifying the translation has been done.
   translation_observer.Wait();
 
   TryBasicFormFill();
 }
 
 // Test filling profiles with unicode strings and crazy characters.
 // TODO(isherman): rewrite as unit test under PersonalDataManagerTest.
 IN_PROC_BROWSER_TEST_F(AutofillTest, FillProfileCrazyCharacters) {
@@ skipping 467 matching lines @@
 //   3. Fill form using a saved profile.
 IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_FormFillableOnReset) {
   ASSERT_TRUE(test_server()->Start());
 
   CreateTestProfile();
 
   GURL url = test_server()->GetURL("files/autofill/autofill_test_form.html");
   ui_test_utils::NavigateToURL(browser(), url);
   PopulateForm("NAME_FIRST");
 
-  ASSERT_TRUE(content::ExecuteJavaScript(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScript(
+      chrome::GetActiveWebContents(browser()),
       "document.getElementById('testform').reset()"));
 
   PopulateForm("NAME_FIRST");
 
   ExpectFieldValue("NAME_FIRST", "Milton");
   ExpectFieldValue("NAME_LAST", "Waddams");
   ExpectFieldValue("EMAIL_ADDRESS", "red.swingline@initech.com");
   ExpectFieldValue("ADDRESS_HOME_LINE1", "4120 Freidrich Lane");
   ExpectFieldValue("ADDRESS_HOME_CITY", "Austin");
   ExpectFieldValue("ADDRESS_HOME_STATE", "Texas");
@@ skipping 129 matching lines @@
   GURL url = test_server()->GetURL(
       "files/autofill/latency_after_submit_test.html");
   ui_test_utils::NavigateToURL(browser(), url);
   PopulateForm("NAME_FIRST");
 
   content::WindowedNotificationObserver load_stop_observer(
       content::NOTIFICATION_LOAD_STOP,
       content::Source<content::NavigationController>(
           &chrome::GetActiveWebContents(browser())->GetController()));
 
-  ASSERT_TRUE(content::ExecuteJavaScript(
+  ASSERT_TRUE(content::ExecuteScript(
       render_view_host(),
-      "",
       "document.getElementById('testform').submit();"));
   // This will ensure the test didn't hang.
   load_stop_observer.Wait();
 }
 
 // http://crbug.com/150084
 #if defined(OS_MACOSX)
 #define MAYBE_DisableAutocompleteWhileFilling DisableAutocompleteWhileFilling
 #else
 #define MAYBE_DisableAutocompleteWhileFilling \
@@ skipping 10 matching lines @@
       GURL(std::string(kDataURIPrefix) + kTestFormString)));
 
   // Invoke Autofill: Start filling the first name field with "M" and wait for
   // the popup to be shown.
   FocusFirstNameField();
   SendKeyAndWait(
       ui::VKEY_M, chrome::NOTIFICATION_AUTOFILL_DID_SHOW_SUGGESTIONS);
 
   // Now that the popup with suggestions is showing, disable autocomplete for
   // the active field.
-  ASSERT_TRUE(content::ExecuteJavaScript(
+  ASSERT_TRUE(content::ExecuteScript(
       render_view_host(),
-      "",
       "document.querySelector('input').autocomplete = 'off';"));
 
   // Press the down arrow to select the suggestion and attempt to preview the
   // autofilled form.
   content::SimulateKeyPress(chrome::GetActiveWebContents(browser()),
                             ui::VKEY_DOWN, false, false, false, false);
 
   // Wait for any IPCs to complete by performing an action that generates an
   // IPC that's easy to wait for.  Chrome shouldn't crash.
   bool result = false;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
       render_view_host(),
-      "",
       "var city = document.getElementById('city');"
       "city.onfocus = function() { domAutomationController.send(true); };"
       "city.focus()",
       &result));
   ASSERT_TRUE(result);
   SendKeyAndWait(
       ui::VKEY_A, chrome::NOTIFICATION_AUTOFILL_DID_SHOW_SUGGESTIONS);
 }
 
 // Test that profiles merge for aggregated data with same address.
@@ skipping 25 matching lines @@
 // TODO(isherman): this looks redundant, consider removing.
 // DISABLED: http://crbug.com/150084
 IN_PROC_BROWSER_TEST_F(AutofillTest,
                        DISABLED_MergeAggregatedDuplicatedProfiles) {
   int num_of_profiles =
       AggregateProfilesIntoAutofillPrefs("dataset_no_address.txt");
 
   ASSERT_GT(num_of_profiles,
             static_cast<int>(personal_data_manager()->GetProfiles().size()));
 }