Refactoring button field and its type (2nd try)

chrome/browser/password_manager/password_manager_browsertest.cc

 // Copyright 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 <utility>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 831 matching lines @@
   first_observer.Wait();
   EXPECT_TRUE(prompt_observer->IsShowingSavePrompt());
   prompt_observer->AcceptSavePrompt();
 
   // Now navigate to a login form that has similar HTML markup.
   NavigateToFile("/password/password_form.html");
 
   // Simulate a user click to force an autofill of the form's DOM value, not
   // just the suggested value.
   content::SimulateMouseClick(
-      WebContents(), 0, blink::WebMouseEvent::ButtonLeft);
+      WebContents(), 0, blink::WebMouseEvent::Button::Left);
 
   // The form should be filled with the previously submitted username.
   std::string get_username =
       "window.domAutomationController.send("
       "document.getElementById('username_field').value);";
   std::string actual_username;
   ASSERT_TRUE(content::ExecuteScriptAndExtractString(RenderViewHost(),
                                                      get_username,
                                                      &actual_username));
   ASSERT_EQ("my_username", actual_username);
@@ skipping 220 matching lines @@
   NavigationObserver reload_observer(WebContents());
   NavigateToFile("/password/form_and_link.html");
   reload_observer.Wait();
 
   // Wait until the username is filled, to make sure autofill kicked in.
   WaitForElementValue("username_field", "temp");
   // Now check that the password is not accessible yet.
   CheckElementValue("password_field", "");
   // Let the user interact with the page.
   content::SimulateMouseClickAt(
-      WebContents(), 0, blink::WebMouseEvent::ButtonLeft, gfx::Point(1, 1));
+      WebContents(), 0, blink::WebMouseEvent::Button::Left, gfx::Point(1, 1));
   // Wait until that interaction causes the password value to be revealed.
   WaitForElementValue("password_field", "random");
   // And check that after the side-effects of the interaction took place, the
   // username value stays the same.
   CheckElementValue("username_field", "temp");
 }
 
 // The following test is limited to Aura, because
 // RenderWidgetHostViewGuest::ProcessAckedTouchEvent is, and
 // ProcessAckedTouchEvent is what triggers the translation of touch events to
@@ skipping 572 matching lines @@
       RenderViewHost(),
       "window.domAutomationController.send(usernameRect.top);",
       &top));
   int left;
   ASSERT_TRUE(content::ExecuteScriptAndExtractInt(
       RenderViewHost(),
       "window.domAutomationController.send(usernameRect.left);",
       &left));
 
   content::SimulateMouseClickAt(
-      WebContents(), 0, blink::WebMouseEvent::ButtonLeft, gfx::Point(left + 1,
+      WebContents(), 0, blink::WebMouseEvent::Button::Left, gfx::Point(left + 1,
                                                                      top + 1));
   // Make sure the popup would be shown.
   observing_autofill_client.Wait();
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase,
                        ChangePwdFormBubbleShown) {
   NavigateToFile("/password/password_form.html");
 
   NavigationObserver observer(WebContents());
@@ skipping 226 matching lines @@
       RenderViewHost(),
       "window.domAutomationController.send(iframeRect.top);",
       &top));
   int left;
   ASSERT_TRUE(content::ExecuteScriptAndExtractInt(
       RenderViewHost(),
       "window.domAutomationController.send(iframeRect.left);",
       &left));
 
   content::SimulateMouseClickAt(
-      WebContents(), 0, blink::WebMouseEvent::ButtonLeft, gfx::Point(left + 1,
+      WebContents(), 0, blink::WebMouseEvent::Button::Left, gfx::Point(left + 1,
                                                                      top + 1));
   // Verify username is not autofilled
   ASSERT_TRUE(content::ExecuteScriptAndExtractString(
       RenderViewHost(),
       "sendMessage('get_username');",
       &empty_username));
   ASSERT_EQ("", empty_username);
   // Verify password is not autofilled
   ASSERT_TRUE(content::ExecuteScriptAndExtractString(
       RenderViewHost(),
@@ skipping 44 matching lines @@
       RenderViewHost(),
       "window.domAutomationController.send(iframeRect.top);",
       &top));
   int left;
   ASSERT_TRUE(content::ExecuteScriptAndExtractInt(
       RenderViewHost(),
       "window.domAutomationController.send(iframeRect.left);",
       &left));
 
   content::SimulateMouseClickAt(
-      WebContents(), 0, blink::WebMouseEvent::ButtonLeft, gfx::Point(left + 1,
+      WebContents(), 0, blink::WebMouseEvent::Button::Left, gfx::Point(left + 1,
                                                                      top + 1));
   // Verify password has been autofilled
   WaitForElementValue("iframe", "password_field", "pa55w0rd");
 
   // Verify username has been autofilled
   CheckElementValue("iframe", "username_field", "temp");
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase, NoFormElementTest) {
   std::string submit =
@@ skipping 283 matching lines @@
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
 
   // Now, navigate to the password form having ambiguous Ids for username and
   // password fields and verify whether username and password is autofilled.
   NavigateToFile("/password/ambiguous_password_form.html");
 
   // Let the user interact with the page, so that DOM gets modification events,
   // needed for autofilling fields.
   content::SimulateMouseClickAt(
-      WebContents(), 0, blink::WebMouseEvent::ButtonLeft, gfx::Point(1, 1));
+      WebContents(), 0, blink::WebMouseEvent::Button::Left, gfx::Point(1, 1));
 
   std::string get_username =
       "window.domAutomationController.send("
       "  document.getElementById('ambiguous_form').elements[0].value);";
   std::string actual_username;
   ASSERT_TRUE(content::ExecuteScriptAndExtractString(
       RenderViewHost(), get_username, &actual_username));
   EXPECT_EQ("myusername", actual_username);
 
   std::string get_password =
@@ skipping 27 matching lines @@
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
 
   // Now, navigate to the password form having no Ids for username and password
   // fields and verify whether username and password is autofilled.
   NavigateToFile("/password/ambiguous_password_form.html");
 
   // Let the user interact with the page, so that DOM gets modification events,
   // needed for autofilling fields.
   content::SimulateMouseClickAt(
-      WebContents(), 0, blink::WebMouseEvent::ButtonLeft, gfx::Point(1, 1));
+      WebContents(), 0, blink::WebMouseEvent::Button::Left, gfx::Point(1, 1));
 
   std::string get_username =
       "window.domAutomationController.send("
       "  document.getElementById('no_name_id_form').elements[0].value);";
   std::string actual_username;
   ASSERT_TRUE(content::ExecuteScriptAndExtractString(
       RenderViewHost(), get_username, &actual_username));
   EXPECT_EQ("myusername", actual_username);
 
   std::string get_password =
@@ skipping 26 matching lines @@
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
 
   // Now, navigate to the password form having no Ids for username and password
   // fields and verify whether username and password is autofilled.
   NavigateToFile("/password/ambiguous_password_form.html");
 
   // Let the user interact with the page, so that DOM gets modification events,
   // needed for autofilling fields.
   content::SimulateMouseClickAt(
-      WebContents(), 0, blink::WebMouseEvent::ButtonLeft, gfx::Point(1, 1));
+      WebContents(), 0, blink::WebMouseEvent::Button::Left, gfx::Point(1, 1));
 
   std::string get_username =
       "window.domAutomationController.send("
       "  document.getElementById("
       "    'change_pwd_but_no_autocomplete').elements[0].value);";
   std::string actual_username;
   ASSERT_TRUE(content::ExecuteScriptAndExtractString(
       RenderViewHost(), get_username, &actual_username));
   EXPECT_EQ("myusername", actual_username);
 
@@ skipping 39 matching lines @@
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
 
   // Now, navigate to the password form having no Ids for username and password
   // fields and verify whether username and password is autofilled.
   NavigateToFile("/password/ambiguous_password_form.html");
 
   // Let the user interact with the page, so that DOM gets modification events,
   // needed for autofilling fields.
   content::SimulateMouseClickAt(
-      WebContents(), 0, blink::WebMouseEvent::ButtonLeft, gfx::Point(1, 1));
+      WebContents(), 0, blink::WebMouseEvent::Button::Left, gfx::Point(1, 1));
 
   std::string get_username =
       "window.domAutomationController.send("
       "  document.getElementById('change_pwd').elements[0].value);";
   std::string actual_username;
   ASSERT_TRUE(content::ExecuteScriptAndExtractString(
       RenderViewHost(), get_username, &actual_username));
   EXPECT_EQ("myusername", actual_username);
 
   std::string get_password =
@@ skipping 36 matching lines @@
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
 
   // Now, navigate to the password form having no Ids for username and password
   // fields and verify whether username and password is autofilled.
   NavigateToFile("/password/ambiguous_password_form.html");
 
   // Let the user interact with the page, so that DOM gets modification events,
   // needed for autofilling fields.
   content::SimulateMouseClickAt(
-      WebContents(), 0, blink::WebMouseEvent::ButtonLeft, gfx::Point(1, 1));
+      WebContents(), 0, blink::WebMouseEvent::Button::Left, gfx::Point(1, 1));
 
   std::string get_username =
       "window.domAutomationController.send("
       "  document.getElementById("
       "    'change_pwd_but_no_old_pwd').elements[0].value);";
   std::string actual_username;
   ASSERT_TRUE(content::ExecuteScriptAndExtractString(
       RenderViewHost(), get_username, &actual_username));
   EXPECT_EQ("", actual_username);
 
@@ skipping 97 matching lines @@
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
 
   // Now, navigate to the hidden password form and verify whether username and
   // password is autofilled.
   NavigateToFile("/password/password_form.html");
 
   // Let the user interact with the page, so that DOM gets modification events,
   // needed for autofilling fields.
   content::SimulateMouseClickAt(
-      WebContents(), 0, blink::WebMouseEvent::ButtonLeft, gfx::Point(1, 1));
+      WebContents(), 0, blink::WebMouseEvent::Button::Left, gfx::Point(1, 1));
 
   std::string get_username =
       "window.domAutomationController.send("
       "  document.getElementById('hidden_password_form_username').value);";
   std::string actual_username;
   ASSERT_TRUE(content::ExecuteScriptAndExtractString(
       RenderViewHost(), get_username, &actual_username));
   EXPECT_EQ("myusername", actual_username);
 
   std::string get_password =
@@ skipping 26 matching lines @@
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
 
   // Now, navigate to the password form with a hidden password field and verify
   // whether username and password is autofilled.
   NavigateToFile("/password/password_form.html");
 
   // Let the user interact with the page, so that DOM gets modification events,
   // needed for autofilling fields.
   content::SimulateMouseClickAt(
-      WebContents(), 0, blink::WebMouseEvent::ButtonLeft, gfx::Point(1, 1));
+      WebContents(), 0, blink::WebMouseEvent::Button::Left, gfx::Point(1, 1));
 
   std::string get_username =
       "window.domAutomationController.send("
       "  document.getElementById('form_with_hidden_password_username').value);";
   std::string actual_username;
   ASSERT_TRUE(content::ExecuteScriptAndExtractString(
       RenderViewHost(), get_username, &actual_username));
   EXPECT_EQ("myusername", actual_username);
 
   std::string get_password =
@@ skipping 26 matching lines @@
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
 
   // Now, navigate to the password form having ambiguous Ids for username and
   // password fields and verify whether username and password is autofilled.
   NavigateToFile("/password/ambiguous_password_form.html");
 
   // Let the user interact with the page, so that DOM gets modification events,
   // needed for autofilling fields.
   content::SimulateMouseClickAt(
-      WebContents(), 0, blink::WebMouseEvent::ButtonLeft, gfx::Point(1, 1));
+      WebContents(), 0, blink::WebMouseEvent::Button::Left, gfx::Point(1, 1));
 
   std::string get_username =
       "window.domAutomationController.send("
       "  document.getElementById('hidden_password_form').elements[0].value);";
   std::string actual_username;
   ASSERT_TRUE(content::ExecuteScriptAndExtractString(
       RenderViewHost(), get_username, &actual_username));
   EXPECT_EQ("myusername", actual_username);
 
   std::string get_password =
@@ skipping 309 matching lines @@
   // about all frames, not just the main one. The factories should receive
   // messages for non-main frames, in particular
   // AutofillHostMsg_PasswordFormsParsed. If that were the first time the
   // factories hear about such frames, this would crash.
   tab_strip_model->AddWebContents(detached_web_contents.release(), -1,
                                   ::ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
                                   TabStripModel::ADD_ACTIVE);
 }
 
 }  // namespace password_manager