Revert of Add ExecuteJavaScriptForTest and make all tests use it

content/renderer/render_view_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/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/memory/shared_memory.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 409 matching lines @@
 
   LoadHTML("<input type=\"text\" id=\"elt_text\"></input>");
 
   // We should NOT have gotten a form state change notification yet.
   EXPECT_FALSE(render_thread_->sink().GetFirstMessageMatching(
       ViewHostMsg_UpdateState::ID));
   render_thread_->sink().ClearMessages();
 
   // Change the value of the input. We should have gotten an update state
   // notification. We need to spin the message loop to catch this update.
-  ExecuteJavaScriptForTests(
-      "document.getElementById('elt_text').value = 'foo';");
+  ExecuteJavaScript("document.getElementById('elt_text').value = 'foo';");
   ProcessPendingMessages();
   EXPECT_TRUE(render_thread_->sink().GetUniqueMessageMatching(
       ViewHostMsg_UpdateState::ID));
 }
 
 TEST_F(RenderViewImplTest, OnNavigationHttpPost) {
   // An http url will trigger a resource load so cannot be used here.
   CommonNavigationParams common_params;
   StartNavigationParams start_params;
   RequestNavigationParams request_params;
@@ skipping 515 matching lines @@
      {"test12", ui::TEXT_INPUT_MODE_EMAIL},
      {"test13", ui::TEXT_INPUT_MODE_URL},
      {"test14", ui::TEXT_INPUT_MODE_DEFAULT},
      {"test15", ui::TEXT_INPUT_MODE_VERBATIM},
   };
 
   const int kRepeatCount = 10;
   for (int i = 0; i < kRepeatCount; i++) {
     // Move the input focus to the first <input> element, where we should
     // activate IMEs.
-    ExecuteJavaScriptForTests("document.getElementById('test1').focus();");
+    ExecuteJavaScript("document.getElementById('test1').focus();");
     ProcessPendingMessages();
     render_thread_->sink().ClearMessages();
 
     // Update the IME status and verify if our IME backend sends an IPC message
     // to activate IMEs.
     view()->UpdateTextInputType();
     const IPC::Message* msg = render_thread_->sink().GetMessageAt(0);
     EXPECT_TRUE(msg != NULL);
     EXPECT_EQ(ViewHostMsg_TextInputTypeChanged::ID, msg->type());
     ViewHostMsg_TextInputTypeChanged::Param params;
     ViewHostMsg_TextInputTypeChanged::Read(msg, &params);
     ui::TextInputType type = base::get<0>(params);
     ui::TextInputMode input_mode = base::get<1>(params);
     bool can_compose_inline = base::get<2>(params);
     EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT, type);
     EXPECT_EQ(true, can_compose_inline);
 
     // Move the input focus to the second <input> element, where we should
     // de-activate IMEs.
-    ExecuteJavaScriptForTests("document.getElementById('test2').focus();");
+    ExecuteJavaScript("document.getElementById('test2').focus();");
     ProcessPendingMessages();
     render_thread_->sink().ClearMessages();
 
     // Update the IME status and verify if our IME backend sends an IPC message
     // to de-activate IMEs.
     view()->UpdateTextInputType();
     msg = render_thread_->sink().GetMessageAt(0);
     EXPECT_TRUE(msg != NULL);
     EXPECT_EQ(ViewHostMsg_TextInputTypeChanged::ID, msg->type());
     ViewHostMsg_TextInputTypeChanged::Read(msg, & params);
@@ skipping 29 matching lines @@
 // Test that our IME backend can compose CJK words.
 // Our IME front-end sends many platform-independent messages to the IME backend
 // while it composes CJK words. This test sends the minimal messages captured
 // on my local environment directly to the IME backend to verify if the backend
 // can compose CJK words without any problems.
 // This test uses an array of command sets because an IME composotion does not
 // only depends on IME events, but also depends on window events, e.g. moving
 // the window focus while composing a CJK text. To handle such complicated
 // cases, this test should not only call IME-related functions in the
 // RenderWidget class, but also call some RenderWidget members, e.g.
-// ExecuteJavaScriptForTests(), RenderWidget::OnSetFocus(), etc.
+// ExecuteJavaScript(), RenderWidget::OnSetFocus(), etc.
 TEST_F(RenderViewImplTest, ImeComposition) {
   enum ImeCommand {
     IME_INITIALIZE,
     IME_SETINPUTMODE,
     IME_SETFOCUS,
     IME_SETCOMPOSITION,
     IME_CONFIRMCOMPOSITION,
     IME_CANCELCOMPOSITION
   };
   struct ImeMessage {
@@ skipping 54 matching lines @@
         // and move the input focus to the <div> element, where we can use
         // IMEs.
         view()->set_send_content_state_immediately(true);
         LoadHTML("<html>"
                 "<head>"
                 "</head>"
                 "<body>"
                 "<div id=\"test1\" contenteditable=\"true\"></div>"
                 "</body>"
                 "</html>");
-        ExecuteJavaScriptForTests("document.getElementById('test1').focus();");
+        ExecuteJavaScript("document.getElementById('test1').focus();");
         break;
 
       case IME_SETINPUTMODE:
         break;
 
       case IME_SETFOCUS:
         // Update the window focus.
         view()->OnSetFocus(ime_message->enable);
         break;
 
@@ skipping 57 matching lines @@
 
   static const struct {
     WebTextDirection direction;
     const wchar_t* expected_result;
   } kTextDirection[] = {
     { blink::WebTextDirectionRightToLeft, L"\x000A" L"rtl,rtl" },
     { blink::WebTextDirectionLeftToRight, L"\x000A" L"ltr,ltr" },
   };
   for (size_t i = 0; i < arraysize(kTextDirection); ++i) {
     // Set the text direction of the <textarea> element.
-    ExecuteJavaScriptForTests("document.getElementById('test').focus();");
+    ExecuteJavaScript("document.getElementById('test').focus();");
     view()->OnSetTextDirection(kTextDirection[i].direction);
 
     // Write the values of its DOM 'dir' attribute and its CSS 'direction'
     // property to the <div> element.
-    ExecuteJavaScriptForTests(
-        "var result = document.getElementById('result');"
-        "var node = document.getElementById('test');"
-        "var style = getComputedStyle(node, null);"
-        "result.innerText ="
-        "    node.getAttribute('dir') + ',' +"
-        "    style.getPropertyValue('direction');");
+    ExecuteJavaScript("var result = document.getElementById('result');"
+                      "var node = document.getElementById('test');"
+                      "var style = getComputedStyle(node, null);"
+                      "result.innerText ="
+                      "    node.getAttribute('dir') + ',' +"
+                      "    style.getPropertyValue('direction');");
 
     // Copy the document content to std::wstring and compare with the
     // expected result.
     const int kMaxOutputCharacters = 16;
     base::string16 output = GetMainFrame()->contentAsText(kMaxOutputCharacters);
     EXPECT_EQ(base::WideToUTF16(kTextDirection[i].expected_result), output);
   }
 }
 
 // Test that we can receive correct DOM events when we send input events
@@ skipping 31 matching lines @@
            "    onkeyup='return OnKeyEvent(event);'>"
            "</input>"
            "<div id='keydown' contenteditable='true'>"
            "</div>"
            "<div id='keypress' contenteditable='true'>"
            "</div>"
            "<div id='keyup' contenteditable='true'>"
            "</div>"
            "</body>"
            "</html>");
-  ExecuteJavaScriptForTests("document.getElementById('test').focus();");
+  ExecuteJavaScript("document.getElementById('test').focus();");
   render_thread_->sink().ClearMessages();
 
   static const MockKeyboard::Layout kLayouts[] = {
 #if defined(OS_WIN)
     // Since we ignore the mock keyboard layout on Linux and instead just use
     // the screen's keyboard layout, these trivially pass. They are commented
     // out to avoid the illusion that they work.
     MockKeyboard::LAYOUT_ARABIC,
     MockKeyboard::LAYOUT_CANADIAN_FRENCH,
     MockKeyboard::LAYOUT_FRENCH,
@@ skipping 246 matching lines @@
     view()->set_send_content_state_immediately(true);
     LoadHTML("<html>"
              "<head>"
              "<title></title>"
              "</head>"
              "<body>"
              "<div id='test' contenteditable='true'>"
              "</div>"
              "</body>"
              "</html>");
-    ExecuteJavaScriptForTests("document.getElementById('test').focus();");
+    ExecuteJavaScript("document.getElementById('test').focus();");
     render_thread_->sink().ClearMessages();
 
     // For each key code, we send three keyboard events.
     //  * Pressing only the key;
     //  * Pressing the key and a left-shift key, and;
     //  * Pressing the key and a right-alt (AltGr) key.
     static const MockKeyboard::Modifiers kModifiers[] = {
       MockKeyboard::NONE,
       MockKeyboard::LEFT_SHIFT,
 #if defined(OS_WIN)
@@ skipping 205 matching lines @@
 #if defined(OS_WIN)
   // http://crbug.com/304193
   if (base::win::GetVersion() < base::win::VERSION_VISTA)
     return;
   // http://crbug.com/508747
   if (base::win::GetVersion() >= base::win::VERSION_WIN10)
     return;
 #endif
 
   LoadHTML("<textarea id=\"test\"></textarea>");
-  ExecuteJavaScriptForTests("document.getElementById('test').focus();");
+  ExecuteJavaScript("document.getElementById('test').focus();");
 
   const base::string16 empty_string;
   const std::vector<blink::WebCompositionUnderline> empty_underline;
   std::vector<gfx::Rect> bounds;
   view()->OnSetFocus(true);
 
   // ASCII composition
   const base::string16 ascii_composition = base::UTF8ToUTF16("aiueo");
   view()->OnImeSetComposition(ascii_composition, empty_underline, 0, 0);
   view()->GetCompositionCharacterBounds(&bounds);
@@ skipping 81 matching lines @@
 
 TEST_F(RenderViewImplTest, SetEditableSelectionAndComposition) {
   // Load an HTML page consisting of an input field.
   LoadHTML("<html>"
            "<head>"
            "</head>"
            "<body>"
            "<input id=\"test1\" value=\"some test text hello\"></input>"
            "</body>"
            "</html>");
-  ExecuteJavaScriptForTests("document.getElementById('test1').focus();");
+  ExecuteJavaScript("document.getElementById('test1').focus();");
   frame()->SetEditableSelectionOffsets(4, 8);
   const std::vector<blink::WebCompositionUnderline> empty_underline;
   frame()->SetCompositionFromExistingText(7, 10, empty_underline);
   blink::WebTextInputInfo info = view()->webview()->textInputInfo();
   EXPECT_EQ(4, info.selectionStart);
   EXPECT_EQ(8, info.selectionEnd);
   EXPECT_EQ(7, info.compositionStart);
   EXPECT_EQ(10, info.compositionEnd);
   frame()->Unselect();
   info = view()->webview()->textInputInfo();
   EXPECT_EQ(0, info.selectionStart);
   EXPECT_EQ(0, info.selectionEnd);
 }
 
 
 TEST_F(RenderViewImplTest, OnExtendSelectionAndDelete) {
   // Load an HTML page consisting of an input field.
   LoadHTML("<html>"
            "<head>"
            "</head>"
            "<body>"
            "<input id=\"test1\" value=\"abcdefghijklmnopqrstuvwxyz\"></input>"
            "</body>"
            "</html>");
-  ExecuteJavaScriptForTests("document.getElementById('test1').focus();");
+  ExecuteJavaScript("document.getElementById('test1').focus();");
   frame()->SetEditableSelectionOffsets(10, 10);
   frame()->ExtendSelectionAndDelete(3, 4);
   blink::WebTextInputInfo info = view()->webview()->textInputInfo();
   EXPECT_EQ("abcdefgopqrstuvwxyz", info.value);
   EXPECT_EQ(7, info.selectionStart);
   EXPECT_EQ(7, info.selectionEnd);
   frame()->SetEditableSelectionOffsets(4, 8);
   frame()->ExtendSelectionAndDelete(2, 5);
   info = view()->webview()->textInputInfo();
   EXPECT_EQ("abuvwxyz", info.value);
@@ skipping 52 matching lines @@
                                 SignedCertificateTimestampIDStatusList()));
   ssl_status = view()->GetSSLStatusOfFrame(frame);
   EXPECT_TRUE(net::IsCertStatusError(ssl_status.cert_status));
 }
 
 TEST_F(RenderViewImplTest, MessageOrderInDidChangeSelection) {
   view()->set_send_content_state_immediately(true);
   LoadHTML("<textarea id=\"test\"></textarea>");
 
   view()->handling_input_event_ = true;
-  ExecuteJavaScriptForTests("document.getElementById('test').focus();");
+  ExecuteJavaScript("document.getElementById('test').focus();");
 
   bool is_input_type_called = false;
   bool is_selection_called = false;
   size_t last_input_type = 0;
   size_t last_selection = 0;
 
   for (size_t i = 0; i < render_thread_->sink().message_count(); ++i) {
     const uint32 type = render_thread_->sink().GetMessageAt(i)->type();
     if (type == ViewHostMsg_TextInputTypeChanged::ID) {
       is_input_type_called = true;
@@ skipping 167 matching lines @@
            "</head>"
            "</html>");
   EXPECT_FALSE(render_thread_->sink().GetFirstMessageMatching(
       ViewHostMsg_UpdateFaviconURL::ID));
 }
 
 TEST_F(RenderViewImplTest, FocusElementCallsFocusedNodeChanged) {
   LoadHTML("<input id='test1' value='hello1'></input>"
            "<input id='test2' value='hello2'></input>");
 
-  ExecuteJavaScriptForTests("document.getElementById('test1').focus();");
+  ExecuteJavaScript("document.getElementById('test1').focus();");
   const IPC::Message* msg1 = render_thread_->sink().GetFirstMessageMatching(
       ViewHostMsg_FocusedNodeChanged::ID);
   EXPECT_TRUE(msg1);
 
   ViewHostMsg_FocusedNodeChanged::Param params;
   ViewHostMsg_FocusedNodeChanged::Read(msg1, &params);
   EXPECT_TRUE(base::get<0>(params));
   render_thread_->sink().ClearMessages();
 
-  ExecuteJavaScriptForTests("document.getElementById('test2').focus();");
+  ExecuteJavaScript("document.getElementById('test2').focus();");
   const IPC::Message* msg2 = render_thread_->sink().GetFirstMessageMatching(
         ViewHostMsg_FocusedNodeChanged::ID);
   EXPECT_TRUE(msg2);
   ViewHostMsg_FocusedNodeChanged::Read(msg2, &params);
   EXPECT_TRUE(base::get<0>(params));
   render_thread_->sink().ClearMessages();
 
   view()->webview()->clearFocusedElement();
   const IPC::Message* msg3 = render_thread_->sink().GetFirstMessageMatching(
         ViewHostMsg_FocusedNodeChanged::ID);
@@ skipping 194 matching lines @@
 TEST_F(DevToolsAgentTest, DevToolsResumeOnClose) {
   Attach();
   EXPECT_FALSE(IsPaused());
   DispatchDevToolsMessage("{\"id\":1,\"method\":\"Debugger.enable\"}");
 
   // Executing javascript will pause the thread and create nested message loop.
   // Posting task simulates message coming from browser.
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(&DevToolsAgentTest::CloseWhilePaused, base::Unretained(this)));
-  ExecuteJavaScriptForTests("debugger;");
+  ExecuteJavaScript("debugger;");
 
   // CloseWhilePaused should resume execution and continue here.
   EXPECT_FALSE(IsPaused());
   Detach();
 }
 
 }  // namespace content