Revert of Add ExecuteJavaScriptForTest and make all tests use it

chrome/renderer/autofill/password_generation_agent_browsertest.cc

 // Copyright 2013 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.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/histogram_tester.h"
 #include "chrome/renderer/autofill/password_generation_test_utils.h"
@@ skipping 33 matching lines @@
     // Enable show-ime event when element is focused by indicating that a user
     // gesture has been processed since load.
     EXPECT_TRUE(SimulateElementClick("dummy"));
   }
 
   void FocusField(const char* element_id) {
     WebDocument document = GetMainFrame()->document();
     blink::WebElement element =
         document.getElementById(blink::WebString::fromUTF8(element_id));
     ASSERT_FALSE(element.isNull());
-    ExecuteJavaScriptForTests(
+    ExecuteJavaScript(
         base::StringPrintf("document.getElementById('%s').focus();",
                            element_id).c_str());
   }
 
   void ExpectGenerationAvailable(const char* element_id,
                                  bool available) {
     FocusField(element_id);
     ExpectPasswordGenerationAvailable(password_generation_,
                                       available);
   }
@@ skipping 346 matching lines @@
   // again.
   SimulateUserTypingASCIICharacter(ui::VKEY_BACK, true);
   // There should now be a message to show the UI.
   ASSERT_EQ(1u, password_generation_->messages().size());
   EXPECT_EQ(AutofillHostMsg_ShowPasswordGenerationPopup::ID,
             password_generation_->messages()[0]->type());
   password_generation_->clear_messages();
 
   // Change focus. Bubble should be hidden, but that is handled by AutofilAgent,
   // so no messages are sent.
-  ExecuteJavaScriptForTests("document.getElementById('username').focus();");
+  ExecuteJavaScript("document.getElementById('username').focus();");
   EXPECT_EQ(0u, password_generation_->messages().size());
   password_generation_->clear_messages();
 
   // Focusing the password field will bring up the generation UI again.
-  ExecuteJavaScriptForTests(
-      "document.getElementById('first_password').focus();");
+  ExecuteJavaScript("document.getElementById('first_password').focus();");
   ASSERT_EQ(1u, password_generation_->messages().size());
   EXPECT_EQ(AutofillHostMsg_ShowPasswordGenerationPopup::ID,
             password_generation_->messages()[0]->type());
   password_generation_->clear_messages();
 
   // Loading a different page triggers UMA stat upload. Verify that only one
   // display event is sent even though
   LoadHTMLWithUserGesture(kSigninFormHTML);
 
   histogram_tester.ExpectBucketCount(
       "PasswordGeneration.Event",
       autofill::password_generation::GENERATION_POPUP_SHOWN,
       1);
 }
 
 TEST_F(PasswordGenerationAgentTest, DynamicFormTest) {
   LoadHTMLWithUserGesture(kSigninFormHTML);
   SetNotBlacklistedMessage(password_generation_, kSigninFormHTML);
 
-  ExecuteJavaScriptForTests(
+  ExecuteJavaScript(
       "var form = document.createElement('form');"
       "var username = document.createElement('input');"
       "username.type = 'text';"
       "username.id = 'dynamic_username';"
       "var first_password = document.createElement('input');"
       "first_password.type = 'password';"
       "first_password.id = 'first_password';"
       "first_password.name = 'first_password';"
       "var second_password = document.createElement('input');"
       "second_password.type = 'password';"
@@ skipping 88 matching lines @@
   ExpectGenerationAvailable("first_password", false);
 
   LoadHTMLWithUserGesture(kNewPasswordAutocompleteAttributeFormHTML);
   SetNotBlacklistedMessage(password_generation_,
                            kNewPasswordAutocompleteAttributeFormHTML);
 
   ExpectGenerationAvailable("first_password", false);
 }
 
 }  // namespace autofill