Refactoring button field and its type

third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 102 matching lines @@
     TestWebViewClient m_webViewClient;
     WebViewImpl* m_webView;
     WebFrame* m_mainFrame;
     FrameTestHelpers::TestWebFrameClient m_webFrameClient;
     Persistent<ChromeClientImpl> m_chromeClientImpl;
 };
 
 TEST_F(GetNavigationPolicyTest, LeftClick)
 {
     int modifiers = 0;
-    WebMouseEvent::Button button = WebMouseEvent::ButtonLeft;
+    WebMouseEvent::Button button = WebMouseEvent::Button::Left;
     bool asPopup = false;
     EXPECT_EQ(WebNavigationPolicyNewForegroundTab,
         getNavigationPolicyWithMouseEvent(modifiers, button, asPopup));
 }
 
 TEST_F(GetNavigationPolicyTest, LeftClickPopup)
 {
     int modifiers = 0;
-    WebMouseEvent::Button button = WebMouseEvent::ButtonLeft;
+    WebMouseEvent::Button button = WebMouseEvent::Button::Left;
     bool asPopup = true;
     EXPECT_EQ(WebNavigationPolicyNewPopup,
         getNavigationPolicyWithMouseEvent(modifiers, button, asPopup));
 }
 
 TEST_F(GetNavigationPolicyTest, ShiftLeftClick)
 {
     int modifiers = WebInputEvent::ShiftKey;
-    WebMouseEvent::Button button = WebMouseEvent::ButtonLeft;
+    WebMouseEvent::Button button = WebMouseEvent::Button::Left;
     bool asPopup = false;
     EXPECT_EQ(WebNavigationPolicyNewWindow,
         getNavigationPolicyWithMouseEvent(modifiers, button, asPopup));
 }
 
 TEST_F(GetNavigationPolicyTest, ShiftLeftClickPopup)
 {
     int modifiers = WebInputEvent::ShiftKey;
-    WebMouseEvent::Button button = WebMouseEvent::ButtonLeft;
+    WebMouseEvent::Button button = WebMouseEvent::Button::Left;
     bool asPopup = true;
     EXPECT_EQ(WebNavigationPolicyNewPopup,
         getNavigationPolicyWithMouseEvent(modifiers, button, asPopup));
 }
 
 TEST_F(GetNavigationPolicyTest, ControlOrMetaLeftClick)
 {
 #if OS(MACOSX)
     int modifiers = WebInputEvent::MetaKey;
 #else
     int modifiers = WebInputEvent::ControlKey;
 #endif
-    WebMouseEvent::Button button = WebMouseEvent::ButtonLeft;
+    WebMouseEvent::Button button = WebMouseEvent::Button::Left;
     bool asPopup = false;
     EXPECT_EQ(WebNavigationPolicyNewBackgroundTab,
         getNavigationPolicyWithMouseEvent(modifiers, button, asPopup));
 }
 
 TEST_F(GetNavigationPolicyTest, ControlOrMetaLeftClickPopup)
 {
 #if OS(MACOSX)
     int modifiers = WebInputEvent::MetaKey;
 #else
     int modifiers = WebInputEvent::ControlKey;
 #endif
-    WebMouseEvent::Button button = WebMouseEvent::ButtonLeft;
+    WebMouseEvent::Button button = WebMouseEvent::Button::Left;
     bool asPopup = true;
     EXPECT_EQ(WebNavigationPolicyNewBackgroundTab,
         getNavigationPolicyWithMouseEvent(modifiers, button, asPopup));
 }
 
 TEST_F(GetNavigationPolicyTest, ControlOrMetaAndShiftLeftClick)
 {
 #if OS(MACOSX)
     int modifiers = WebInputEvent::MetaKey;
 #else
     int modifiers = WebInputEvent::ControlKey;
 #endif
     modifiers |= WebInputEvent::ShiftKey;
-    WebMouseEvent::Button button = WebMouseEvent::ButtonLeft;
+    WebMouseEvent::Button button = WebMouseEvent::Button::Left;
     bool asPopup = false;
     EXPECT_EQ(WebNavigationPolicyNewForegroundTab,
         getNavigationPolicyWithMouseEvent(modifiers, button, asPopup));
 }
 
 TEST_F(GetNavigationPolicyTest, ControlOrMetaAndShiftLeftClickPopup)
 {
 #if OS(MACOSX)
     int modifiers = WebInputEvent::MetaKey;
 #else
     int modifiers = WebInputEvent::ControlKey;
 #endif
     modifiers |= WebInputEvent::ShiftKey;
-    WebMouseEvent::Button button = WebMouseEvent::ButtonLeft;
+    WebMouseEvent::Button button = WebMouseEvent::Button::Left;
     bool asPopup = true;
     EXPECT_EQ(WebNavigationPolicyNewForegroundTab,
         getNavigationPolicyWithMouseEvent(modifiers, button, asPopup));
 }
 
 TEST_F(GetNavigationPolicyTest, MiddleClick)
 {
     int modifiers = 0;
     bool asPopup = false;
-    WebMouseEvent::Button button = WebMouseEvent::ButtonMiddle;
+    WebMouseEvent::Button button = WebMouseEvent::Button::Middle;
     EXPECT_EQ(WebNavigationPolicyNewBackgroundTab,
         getNavigationPolicyWithMouseEvent(modifiers, button, asPopup));
 }
 
 TEST_F(GetNavigationPolicyTest, MiddleClickPopup)
 {
     int modifiers = 0;
     bool asPopup = true;
-    WebMouseEvent::Button button = WebMouseEvent::ButtonMiddle;
+    WebMouseEvent::Button button = WebMouseEvent::Button::Middle;
     EXPECT_EQ(WebNavigationPolicyNewBackgroundTab,
         getNavigationPolicyWithMouseEvent(modifiers, button, asPopup));
 }
 
 TEST_F(GetNavigationPolicyTest, NoToolbarsForcesPopup)
 {
     m_chromeClientImpl->setToolbarsVisible(false);
     EXPECT_TRUE(isNavigationPolicyPopup());
     m_chromeClientImpl->setToolbarsVisible(true);
     EXPECT_FALSE(isNavigationPolicyPopup());
@@ skipping 61 matching lines @@
 {
     m_webView->page()->setDefersLoading(true);
     LocalFrame* frame = toWebLocalFrameImpl(m_mainFrame)->frame();
     FrameLoadRequest request(frame->document());
     WindowFeatures features;
     EXPECT_EQ(nullptr, m_chromeClientImpl->createWindow(frame, request, features, NavigationPolicyNewForegroundTab));
     m_webView->page()->setDefersLoading(false);
 }
 
 } // namespace blink