Revert of Add ExecuteJavaScriptForTest and make all tests use it

content/renderer/accessibility/renderer_accessibility_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/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "content/common/frame_messages.h"
 #include "content/common/view_message_enums.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/render_view_test.h"
@@ skipping 230 matching lines @@
   accessibility->SendPendingAccessibilityEvents();
   EXPECT_EQ(4, CountAccessibilityNodesSentToBrowser());
 
   WebDocument document = view()->GetWebView()->mainFrame()->document();
   WebAXObject root_obj = document.accessibilityObject();
   WebAXObject node_a = root_obj.childAt(0);
   WebAXObject node_b = node_a.childAt(0);
   WebAXObject node_c = node_b.childAt(0);
 
   // Hide node 'B' ('C' stays visible).
-  ExecuteJavaScriptForTests(
+  ExecuteJavaScript(
       "document.getElementById('B').style.visibility = 'hidden';");
   // Force layout now.
-  ExecuteJavaScriptForTests("document.getElementById('B').offsetLeft;");
+  ExecuteJavaScript("document.getElementById('B').offsetLeft;");
 
   // Send a childrenChanged on 'A'.
   sink_->ClearMessages();
   accessibility->HandleAXEvent(
       node_a,
       ui::AX_EVENT_CHILDREN_CHANGED);
 
   accessibility->SendPendingAccessibilityEvents();
   AccessibilityHostMsg_EventParams event;
   GetLastAccEvent(&event);
@@ skipping 22 matching lines @@
       "  </div>"
       "</body>";
   LoadHTML(html.c_str());
 
   scoped_ptr<TestRendererAccessibility> accessibility(
       new TestRendererAccessibility(frame()));
   accessibility->SendPendingAccessibilityEvents();
   EXPECT_EQ(3, CountAccessibilityNodesSentToBrowser());
 
   // Show node 'B', then send a childrenChanged on 'A'.
-  ExecuteJavaScriptForTests(
+  ExecuteJavaScript(
       "document.getElementById('B').style.visibility = 'visible';");
-  ExecuteJavaScriptForTests("document.getElementById('B').offsetLeft;");
+  ExecuteJavaScript("document.getElementById('B').offsetLeft;");
 
   sink_->ClearMessages();
   WebDocument document = view()->GetWebView()->mainFrame()->document();
   WebAXObject root_obj = document.accessibilityObject();
   WebAXObject node_a = root_obj.childAt(0);
   WebAXObject node_b = node_a.childAt(0);
   WebAXObject node_c = node_b.childAt(0);
 
   accessibility->HandleAXEvent(
       node_a,
@@ skipping 38 matching lines @@
   //         +--Inline Text Box "2"
   WebDocument document = view()->GetWebView()->mainFrame()->document();
   WebAXObject root_obj = document.accessibilityObject();
   WebAXObject body = root_obj.childAt(0);
   WebAXObject anonymous_block = body.childAt(0);
   WebAXObject text_1 = anonymous_block.childAt(0);
   WebAXObject text_2 = body.childAt(1);
 
   // Change the display of the second 'span' back to inline, which causes the
   // anonymous block to be destroyed.
-  ExecuteJavaScriptForTests(
+  ExecuteJavaScript(
       "document.querySelectorAll('span')[1].style.display = 'inline';");
   // Force layout now.
-  ExecuteJavaScriptForTests("document.body.offsetLeft;");
+  ExecuteJavaScript("document.body.offsetLeft;");
 
   // Send a childrenChanged on the body.
   sink_->ClearMessages();
   accessibility->HandleAXEvent(
       body,
       ui::AX_EVENT_CHILDREN_CHANGED);
 
   accessibility->SendPendingAccessibilityEvents();
 
   // Afterwards, the accessibility tree looks like this:
@@ skipping 48 matching lines @@
 
   const IPC::Message* message =
       sink_->GetUniqueMessageMatching(AccessibilityHostMsg_Events::ID);
   ASSERT_TRUE(message);
   base::Tuple<std::vector<AccessibilityHostMsg_EventParams>, int> param;
   AccessibilityHostMsg_Events::Read(message, &param);
   ASSERT_EQ(0U, base::get<0>(param).size());
 }
 
 }  // namespace content