Remove DOMAutomationController::automation_id_

content/browser/site_per_process_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 "content/browser/site_per_process_browsertest.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 2177 matching lines @@
       "   |--Site D ------- proxies for A\n"
       "   +--Site A ------- proxies for D\n"
       "        +--Site A -- proxies for D\n"
       "Where A = http://a.com/\n"
       "      D = http://f00.com/",
       DepictFrameTree(root));
 
   // Navigate the iframe itself to about:blank using a script executing in its
   // own context. It should stay in the same SiteInstance as before, not the
   // parent one.
-  std::string script(
-      "window.domAutomationController.send("
-      "window.location.href = 'about:blank');");
   TestFrameNavigationObserver frame_observer(child);
-  EXPECT_TRUE(ExecuteScript(child, script));
+  ExecuteScriptAsync(child, "window.location.href = 'about:blank';");
   frame_observer.Wait();
   EXPECT_EQ(about_blank_url, child->current_url());
 
   // Ensure that we have navigated using the top level process.
   EXPECT_EQ(
       " Site A ------------ proxies for D\n"
       "   |--Site D ------- proxies for A\n"
       "   +--Site A ------- proxies for D\n"
       "        +--Site A -- proxies for D\n"
       "Where A = http://a.com/\n"
@@ skipping 3236 matching lines @@
   const char kSetupFocusEvents[] =
       "window.addEventListener('focus', function() {"
       "  domAutomationController.setAutomationId(0);"
       "  domAutomationController.send('%s-got-focus');"
       "});"
       "window.addEventListener('blur', function() {"
       "  domAutomationController.setAutomationId(0);"
       "  domAutomationController.send('%s-lost-focus');"
       "});";
   std::string script = base::StringPrintf(kSetupFocusEvents, "main", "main");
-  EXPECT_TRUE(ExecuteScript(shell(), script));
+  ExecuteScriptAsync(shell(), script);
   script = base::StringPrintf(kSetupFocusEvents, "child1", "child1");
-  EXPECT_TRUE(ExecuteScript(child1, script));
+  ExecuteScriptAsync(child1, script);
   script = base::StringPrintf(kSetupFocusEvents, "child2", "child2");
-  EXPECT_TRUE(ExecuteScript(child2, script));
+  ExecuteScriptAsync(child2, script);
 
   // Execute window.focus on the B subframe from the A main frame.
-  EXPECT_TRUE(ExecuteScript(root, "frames[0].focus()"));
+  ExecuteScriptAsync(root, "frames[0].focus()");
 
   // Helper to wait for two specified messages to arrive on the specified
   // DOMMessageQueue, assuming that the two messages can arrive in any order.
   auto wait_for_two_messages = [](DOMMessageQueue* msg_queue,
                                   const std::string& msg1,
                                   const std::string& msg2) {
     bool msg1_received = false;
     bool msg2_received = false;
     std::string status;
     while (msg_queue->WaitForMessage(&status)) {
       if (status == msg1)
         msg1_received = true;
       if (status == msg2)
         msg2_received = true;
       if (msg1_received && msg2_received)
         break;
     }
   };
 
   // Process A should fire a blur event, and process B should fire a focus
   // event.  Wait for both events.
   wait_for_two_messages(&msg_queue, "\"main-lost-focus\"",
                         "\"child1-got-focus\"");
 
   // The B subframe should now be focused in the browser process.
   EXPECT_EQ(child1, root->frame_tree()->GetFocusedFrame());
 
   // Now, execute window.focus on the C subframe from A main frame.  This
   // checks that we can shift focus from one remote frame to another.
-  EXPECT_TRUE(ExecuteScript(root, "frames[1].focus()"));
+  ExecuteScriptAsync(root, "frames[1].focus()");
 
   // Wait for the two subframes (B and C) to fire blur and focus events.
   wait_for_two_messages(&msg_queue, "\"child1-lost-focus\"",
                         "\"child2-got-focus\"");
 
   // The C subframe should now be focused.
   EXPECT_EQ(child2, root->frame_tree()->GetFocusedFrame());
 
   // window.focus the main frame from the C subframe.
-  EXPECT_TRUE(ExecuteScript(child2, "parent.focus()"));
+  ExecuteScriptAsync(child2, "parent.focus()");
 
   // Wait for the C subframe to blur and main frame to focus.
   wait_for_two_messages(&msg_queue, "\"child2-lost-focus\"",
                         "\"main-got-focus\"");
 
   // The main frame should now be focused.
   EXPECT_EQ(root, root->frame_tree()->GetFocusedFrame());
 }
 
 // There are no cursors on Android.
@@ skipping 123 matching lines @@
         "  domAutomationController.setAutomationId(0);"
         "  domAutomationController.send('wheel: ' + wheel_count);"
         "}"
         "function scroll_handler(e) {"
         "  domAutomationController.setAutomationId(0);"
         "  domAutomationController.send('scroll: ' + wheel_count);"
         "}"
         "scroll_div = document.getElementById('scrollable_div');"
         "scroll_div.addEventListener('wheel', wheel_handler);"
         "scroll_div.addEventListener('scroll', scroll_handler);"
-        "domAutomationController.setAutomationId(0);"
-        "domAutomationController.send('wheel handler installed');"
         "document.body.style.background = 'black';";
 
     content::DOMMessageQueue msg_queue;
     std::string reply;
     EXPECT_TRUE(ExecuteScript(rfh, script));
 
     // Wait until renderer's compositor thread is synced. Otherwise the event
     // handler won't be installed when the event arrives.
     {
       MainThreadFrameObserver observer(rfh->GetRenderWidgetHost());
@@ skipping 2184 matching lines @@
   EXPECT_EQ(1U, root->child_count());
 
   // Ensure the RenderViewHost for the SiteInstance of the child is considered
   // in swapped out state.
   RenderViewHostImpl* rvh = contents->GetFrameTree()->GetRenderViewHost(
       root->child_at(0)->current_frame_host()->GetSiteInstance());
   EXPECT_TRUE(rvh->is_swapped_out_);
 
   // Have the child frame navigate its parent to its SiteInstance.
   GURL b_url(embedded_test_server()->GetURL("b.com", "/title1.html"));
-  std::string script = base::StringPrintf(
-      "window.domAutomationController.send("
-      "parent.location = '%s');",
-      b_url.spec().c_str());
+  std::string script =
+      base::StringPrintf("parent.location = '%s';", b_url.spec().c_str());
 
   // Ensure the child has received a user gesture, so that it has permission
   // to framebust.
   SimulateMouseClick(
       root->child_at(0)->current_frame_host()->GetRenderWidgetHost(), 1, 1);
   TestFrameNavigationObserver frame_observer(root);
   EXPECT_TRUE(ExecuteScript(root->child_at(0), script));
   frame_observer.Wait();
   EXPECT_EQ(b_url, root->current_url());
 
@@ skipping 2916 matching lines @@
   SimpleTap(gfx::Point(point_outside_iframe.x(), point_outside_iframe.y()));
   selection_controller_client->Wait();
 
   EXPECT_EQ(ui::TouchSelectionController::INACTIVE,
             parent_view->touch_selection_controller()->active_status());
 }
 
 #endif  // defined(OS_ANDROID)
 
 }  // namespace content