Remove all calls to domAutomationController.setAutomationId.

content/public/test/browser_test_utils.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/public/test/browser_test_utils.h"
 
 #include <stddef.h>
 #include <tuple>
 #include <utility>
 
@@ skipping 119 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(InterstitialObserver);
 };
 
 // Specifying a prototype so that we can add the WARN_UNUSED_RESULT attribute.
 bool ExecuteScriptHelper(RenderFrameHost* render_frame_host,
                          const std::string& original_script,
                          bool user_gesture,
                          std::unique_ptr<base::Value>* result)
     WARN_UNUSED_RESULT;
 
-// Executes the passed |original_script| in the frame specified by
-// |render_frame_host|.  If |result| is not NULL, stores the value that the
-// evaluation of the script in |result|.  Returns true on success.
+// Executes the passed |script| in the frame specified by |render_frame_host|.
+// If |result| is not NULL, stores the value that the evaluation of the script
+// in |result|.  Returns true on success.
 bool ExecuteScriptHelper(RenderFrameHost* render_frame_host,
-                         const std::string& original_script,
+                         const std::string& script,
                          bool user_gesture,
                          std::unique_ptr<base::Value>* result) {
-  // TODO(jcampan): we should make the domAutomationController not require an
-  //                automation id.
-  std::string script =
-      "window.domAutomationController.setAutomationId(0);" + original_script;
   // TODO(lukasza): Only get messages from the specific |render_frame_host|.
   DOMMessageQueue dom_message_queue(
       WebContents::FromRenderFrameHost(render_frame_host));
   if (user_gesture) {
     render_frame_host->ExecuteJavaScriptWithUserGestureForTests(
         base::UTF8ToUTF16(script));
   } else {
     render_frame_host->ExecuteJavaScriptForTests(base::UTF8ToUTF16(script));
   }
   std::string json;
@@ skipping 48 matching lines @@
 
 // Specifying a prototype so that we can add the WARN_UNUSED_RESULT attribute.
 bool ExecuteScriptInIsolatedWorldHelper(RenderFrameHost* render_frame_host,
                                         const int world_id,
                                         const std::string& original_script,
                                         std::unique_ptr<base::Value>* result)
     WARN_UNUSED_RESULT;
 
 bool ExecuteScriptInIsolatedWorldHelper(RenderFrameHost* render_frame_host,
                                         const int world_id,
-                                        const std::string& original_script,
+                                        const std::string& script,
                                         std::unique_ptr<base::Value>* result) {
-  // TODO(jcampan): we should make the domAutomationController not require an
-  //                automation id.
-  std::string script =
-      "window.domAutomationController.setAutomationId(0);" + original_script;
   // TODO(lukasza): Only get messages from the specific |render_frame_host|.
   DOMMessageQueue dom_message_queue(
       WebContents::FromRenderFrameHost(render_frame_host));
   render_frame_host->ExecuteJavaScriptInIsolatedWorld(
       base::UTF8ToUTF16(script),
       content::RenderFrameHost::JavaScriptResultCallback(), world_id);
   std::string json;
   if (!dom_message_queue.WaitForMessage(&json)) {
     DLOG(ERROR) << "Cannot communicate with DOMMessageQueue.";
     return false;
@@ skipping 1903 matching lines @@
   RenderWidgetHostViewAura* rwhva =
       static_cast<RenderWidgetHostViewAura*>(rwhv);
   rwhva->SetOverscrollControllerForTesting(std::move(mock));
 
   return raw_mock;
 }
 
 #endif  // defined(USE_AURA)
 
 }  // namespace content