Remove DOMAutomationController::automation_id_

chrome/browser/autofill/autofill_interactive_uitest.cc

 // Copyright (c) 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>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ skipping 51 matching lines @@
 using base::ASCIIToUTF16;
 
 namespace autofill {
 
 namespace {
 
 static const char kDataURIPrefix[] = "data:text/html;charset=utf-8,";
 static const char kTestFormString[] =
     "<form action=\"http://www.example.com/\" method=\"POST\">"
     "<label for=\"firstname\">First name:</label>"
-    " <input type=\"text\" id=\"firstname\""
-    "        onfocus=\"domAutomationController.send(true)\"><br>"
+    " <input type=\"text\" id=\"firstname\"><br>"
     "<label for=\"lastname\">Last name:</label>"
     " <input type=\"text\" id=\"lastname\"><br>"
     "<label for=\"address1\">Address line 1:</label>"
     " <input type=\"text\" id=\"address1\"><br>"
     "<label for=\"address2\">Address line 2:</label>"
     " <input type=\"text\" id=\"address2\"><br>"
     "<label for=\"city\">City:</label>"
     " <input type=\"text\" id=\"city\"><br>"
     "<label for=\"state\">State:</label>"
     " <select id=\"state\">"
@@ skipping 29 matching lines @@
     "var textchange = false;"
     "var textkeyup = false;"
     "var textblur = false;"
     "var selectfocus = false;"
     "var selectinput = false;"
     "var selectchange = false;"
     "var selectblur = false;"
     "</script>"
     "<form action=\"http://www.example.com/\" method=\"POST\">"
     "<label for=\"firstname\">First name:</label>"
-    " <input type=\"text\" id=\"firstname\""
-    "        onfocus=\"domAutomationController.send(true)\"><br>"
+    " <input type=\"text\" id=\"firstname\"><br>"
     "<label for=\"lastname\">Last name:</label>"
     " <input type=\"text\" id=\"lastname\""
     " onfocus=\"inputfocus = true\" onkeydown=\"inputkeydown = true\""
     " oninput=\"inputinput = true\" onchange=\"inputchange = true\""
     " onkeyup=\"inputkeyup = true\" onblur=\"inputblur = true\" ><br>"
     "<label for=\"address1\">Address line 1:</label>"
     " <input type=\"text\" id=\"address1\"><br>"
     "<label for=\"address2\">Address line 2:</label>"
     " <input type=\"text\" id=\"address2\"><br>"
     "<label for=\"city\">City:</label>"
@@ skipping 219 matching lines @@
     fetcher->set_status(net::URLRequestStatus::FromError(error));
     fetcher->set_response_code(success ? 200 : 500);
     fetcher->SetResponseString(script);
     fetcher->delegate()->OnURLFetchComplete(fetcher);
   }
 
   void FocusFieldByName(const std::string& name) {
     bool result = false;
     ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
         GetRenderViewHost(),
-        "if (document.readyState === 'complete')"
-        "  document.getElementById('" + name + "').focus();"
-        "else"
-        "  domAutomationController.send(false);",
+        "function onFocusHandler(e) {"
+        "  e.target.removeEventListener(e.type, arguments.callee);"
+        "  domAutomationController.send(true);"
+        "}"
+        "if (document.readyState === 'complete') {"
+        "  var target = document.getElementById('" +
+            name +
+            "');"
+            "  target.addEventListener('focus', onFocusHandler);"
+            "  target.focus();"
+            "} else {"
+            "  domAutomationController.send(false);"
+            "}",
         &result));
     ASSERT_TRUE(result);
   }
 
-  void FocusFirstNameField() {
-    bool result = false;
-    ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
-        GetRenderViewHost(),
-        "if (document.readyState === 'complete')"
-        "  document.getElementById('firstname').focus();"
-        "else"
-        "  domAutomationController.send(false);",
-        &result));
-    ASSERT_TRUE(result);
-  }
+  void FocusFirstNameField() { FocusFieldByName("firstname"); }
 
   // Simulates a click on the middle of the DOM element with the given |id|.
   void ClickElementWithId(const std::string& id) {
     int x;
     ASSERT_TRUE(content::ExecuteScriptAndExtractInt(
         GetRenderViewHost(),
         "var bounds = document.getElementById('" +
             id +
             "').getBoundingClientRect();"
             "domAutomationController.send("
@@ skipping 395 matching lines @@
 #else
 #define MAYBE_OnSelectOptionFromDatalist OnSelectOptionFromDatalist
 #endif
 IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest,
                        MAYBE_OnSelectOptionFromDatalist) {
   // Load the test page.
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(
       browser(),
       GURL(std::string(kDataURIPrefix) +
            "<form action=\"http://www.example.com/\" method=\"POST\">"
-           "  <input list=\"dl\" type=\"search\" id=\"firstname\""
-           "         onfocus=\"domAutomationController.send(true)\"><br>"
+           "  <input list=\"dl\" type=\"search\" id=\"firstname\"><br>"
            "  <datalist id=\"dl\">"
            "  <option value=\"Adam\"></option>"
            "  <option value=\"Bob\"></option>"
            "  <option value=\"Carl\"></option>"
            "  </datalist>"
            "</form>")));
   std::string orginalcolor;
   GetFieldBackgroundColor("firstname", &orginalcolor);
 
   FocusFirstNameField();
@@ skipping 1081 matching lines @@
   std::string script_focus(
       "window.focus();"
       "document.getElementById('CREDIT_CARD_NUMBER').focus();");
   ASSERT_TRUE(content::ExecuteScript(cross_frame, script_focus));
 
   // Send an arrow dow keypress in order to trigger the autofill popup.
   SendKeyToPageAndWait(ui::DomKey::ARROW_DOWN);
 }
 
 }  // namespace autofill