Refactoring button field and its type (2nd try)

chrome/browser/apps/guest_view/web_view_interactive_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 <stddef.h>
 
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/stringprintf.h"
@@ skipping 457 matching lines @@
     content::WebContents* embedder_web_contents =
         GetFirstAppWindowWebContents();
     ASSERT_TRUE(embedder_web_contents);
     ASSERT_TRUE(guest_web_contents());
     // Click the guest to request fullscreen.
     ExtensionTestMessageListener passed_listener(
         "FULLSCREEN_STEP_PASSED", false);
     passed_listener.set_failure_message("TEST_FAILED");
     content::SimulateMouseClickAt(guest_web_contents(),
                                   0,
-                                  blink::WebMouseEvent::ButtonLeft,
+                                  blink::WebMouseEvent::Button::Left,
                                   gfx::Point(20, 20));
     ASSERT_TRUE(passed_listener.WaitUntilSatisfied());
   }
 
  protected:
   TestGuestViewManagerFactory factory_;
   content::WebContents* guest_web_contents_;
   content::WebContents* embedder_web_contents_;
   gfx::Point corner_;
   bool mouse_click_result_;
@@ skipping 185 matching lines @@
         RunAppHelper("testAdvanceFocus", "web_view/focus", NO_TEST_SERVER,
                      &embedder_web_contents));
     done_listener->WaitUntilSatisfied();
   }
 
   {
     ExtensionTestMessageListener listener("button1-focused", false);
     listener.set_failure_message("TEST_FAILED");
     SimulateRWHMouseClick(
         embedder_web_contents->GetRenderViewHost()->GetWidget(),
-        blink::WebMouseEvent::ButtonLeft, 200, 20);
+        blink::WebMouseEvent::Button::Left, 200, 20);
     content::SimulateKeyPress(embedder_web_contents, ui::DomKey::TAB,
                               ui::DomCode::TAB, ui::VKEY_TAB, false, false,
                               false, false);
     ASSERT_TRUE(listener.WaitUntilSatisfied());
   }
 
   {
     // Wait for button1 to be focused again, this means we were asked to
     // move the focus to the next focusable element.
     ExtensionTestMessageListener listener("button1-advance-focus", false);
@@ skipping 218 matching lines @@
 // <webview> sees transformed coordinates, the point is transformed in
 // CrossProcessFrameConnector::TransformPointToRootCoordSpace.
 IN_PROC_BROWSER_TEST_F(WebViewContextMenuInteractiveTest,
                        ContextMenuParamCoordinates) {
   TestHelper("testCoordinates", "web_view/context_menus/coordinates",
              NO_TEST_SERVER);
   ASSERT_TRUE(guest_web_contents());
 
   ContextMenuWaiter menu_observer(content::NotificationService::AllSources());
   SimulateRWHMouseClick(guest_web_contents()->GetRenderViewHost()->GetWidget(),
-                        blink::WebMouseEvent::ButtonRight, 10, 20);
+                        blink::WebMouseEvent::Button::Right, 10, 20);
   // Wait until the context menu is opened and closed.
   menu_observer.WaitForMenuOpenAndClose();
   ASSERT_EQ(10, menu_observer.params().x);
   ASSERT_EQ(20, menu_observer.params().y);
 }
 
 // Tests whether <webview> context menu sees <webview> local coordinates in its
 // RenderViewContextMenu params, when it is subject to CSS transforms.
 //
 // This test doesn't makes sense in --use-cross-process-frames-for-guests, since
@@ skipping 33 matching lines @@
         embedder_web_contents()->GetRenderWidgetHostView()->GetViewBounds();
     gfx::Rect guest_view_bounds =
         guest_web_contents()->GetRenderWidgetHostView()->GetViewBounds();
     ContextMenuWaiter menu_observer(content::NotificationService::AllSources());
     gfx::Point guest_window_point(150, 150);
     gfx::Point embedder_window_point = guest_window_point;
     embedder_window_point += guest_view_bounds.OffsetFromOrigin();
     embedder_window_point -= embedder_view_bounds.OffsetFromOrigin();
     SimulateRWHMouseClick(
         embedder_web_contents()->GetRenderViewHost()->GetWidget(),
-        blink::WebMouseEvent::ButtonRight,
+        blink::WebMouseEvent::Button::Right,
         /* Using window coordinates for the embedder */
         embedder_window_point.x(), embedder_window_point.y());
 
     menu_observer.WaitForMenuOpenAndClose();
     EXPECT_EQ(menu_observer.params().x, guest_window_point.x());
     EXPECT_EQ(menu_observer.params().y, guest_window_point.y());
   }
 }
 
 IN_PROC_BROWSER_TEST_P(WebViewInteractiveTest, ExecuteCode) {
@@ skipping 164 matching lines @@
   content::WebContents* embedder_web_contents = GetFirstAppWindowWebContents();
   ASSERT_TRUE(embedder_web_contents);
   ASSERT_TRUE(guest_web_contents());
 
   // 1) We click on the guest so that we get a focus event.
   ExtensionTestMessageListener next_step_listener("TEST_STEP_PASSED", false);
   next_step_listener.set_failure_message("TEST_STEP_FAILED");
   {
     content::SimulateMouseClickAt(guest_web_contents(),
                                   0,
-                                  blink::WebMouseEvent::ButtonLeft,
+                                  blink::WebMouseEvent::Button::Left,
                                   gfx::Point(10, 10));
     EXPECT_TRUE(content::ExecuteScript(
                     embedder_web_contents,
                     "window.runCommand('testFocusRestoredRunNextStep', 1);"));
   }
   // Wait for the next step to complete.
   ASSERT_TRUE(next_step_listener.WaitUntilSatisfied());
 
   // 2) We click on the embedder so the guest's focus goes away and it observes
   // a blur event.
   next_step_listener.Reset();
   {
     content::SimulateMouseClickAt(embedder_web_contents,
                                   0,
-                                  blink::WebMouseEvent::ButtonLeft,
+                                  blink::WebMouseEvent::Button::Left,
                                   gfx::Point(200, 20));
     EXPECT_TRUE(content::ExecuteScript(
                     embedder_web_contents,
                     "window.runCommand('testFocusRestoredRunNextStep', 2);"));
   }
   // Wait for the next step to complete.
   ASSERT_TRUE(next_step_listener.WaitUntilSatisfied());
 
   // 3) We click on the guest again to bring back focus directly to the previous
   // input element, then we ensure text_input_type is properly set.
   next_step_listener.Reset();
   {
     content::SimulateMouseClickAt(guest_web_contents(),
                                   0,
-                                  blink::WebMouseEvent::ButtonLeft,
+                                  blink::WebMouseEvent::Button::Left,
                                   gfx::Point(10, 10));
     EXPECT_TRUE(content::ExecuteScript(
                     embedder_web_contents,
                     "window.runCommand('testFocusRestoredRunNextStep', 3)"));
   }
   // Wait for the next step to complete.
   ASSERT_TRUE(next_step_listener.WaitUntilSatisfied());
 
   // |text_input_client| is not available for mac and android.
 #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
@@ skipping 94 matching lines @@
   SetupTest("web_view/text_selection",
             "/extensions/platform_apps/web_view/text_selection/guest.html");
   ASSERT_TRUE(guest_web_contents());
   ASSERT_TRUE(ui_test_utils::ShowAndFocusNativeWindow(
       GetPlatformAppWindow()));
 
   // Wait until guest sees a context menu, select an arbitrary item (copy).
   ExtensionTestMessageListener ctx_listener("MSG_CONTEXTMENU", false);
   ContextMenuNotificationObserver menu_observer(IDC_CONTENT_CONTEXT_COPY);
   SimulateRWHMouseClick(guest_web_contents()->GetRenderViewHost()->GetWidget(),
-                        blink::WebMouseEvent::ButtonRight, 20, 20);
+                        blink::WebMouseEvent::Button::Right, 20, 20);
   ASSERT_TRUE(ctx_listener.WaitUntilSatisfied());
 
   // Now verify that the selection text propagates properly to RWHV.
   content::RenderWidgetHostView* guest_rwhv =
       guest_web_contents()->GetRenderWidgetHostView();
   ASSERT_TRUE(guest_rwhv);
   std::string selected_text = base::UTF16ToUTF8(guest_rwhv->GetSelectedText());
   ASSERT_TRUE(selected_text.size() >= 10u);
   ASSERT_EQ("AAAAAAAAAA", selected_text.substr(0, 10));
 }
@@ skipping 69 matching lines @@
   ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync(
       GetPlatformAppWindow(), ui::VKEY_C, false, false, false, false));
 
   next_step_listener.Reset();
   EXPECT_TRUE(content::ExecuteScript(
       embedder_web_contents(),
       "window.runCommand('testKeyboardFocusRunNextStep', 'aBc');"));
 
   ASSERT_TRUE(next_step_listener.WaitUntilSatisfied());
 }