| Index: chrome/browser/ui/browser_browsertest.cc
|
| diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
|
| index ded8e2fe9de0c2beff89ad8d16c57fe550b01954..0685a8f9f7bcaae5f867689004d2afb97991e0fe 100644
|
| --- a/chrome/browser/ui/browser_browsertest.cc
|
| +++ b/chrome/browser/ui/browser_browsertest.cc
|
| @@ -2417,7 +2417,7 @@ class ClickModifierTest : public InProcessBrowserTest {
|
|
|
| IN_PROC_BROWSER_TEST_F(ClickModifierTest, WindowOpenBasicClickTest) {
|
| int modifiers = 0;
|
| - blink::WebMouseEvent::Button button = blink::WebMouseEvent::ButtonLeft;
|
| + blink::WebMouseEvent::Button button = blink::WebMouseEvent::Button::Left;
|
| WindowOpenDisposition disposition = NEW_FOREGROUND_TAB;
|
| RunTest(browser(), GetWindowOpenURL(), modifiers, button, disposition);
|
| }
|
| @@ -2428,7 +2428,7 @@ IN_PROC_BROWSER_TEST_F(ClickModifierTest, WindowOpenBasicClickTest) {
|
| // Shift-clicks open in a new window.
|
| IN_PROC_BROWSER_TEST_F(ClickModifierTest, WindowOpenShiftClickTest) {
|
| int modifiers = blink::WebInputEvent::ShiftKey;
|
| - blink::WebMouseEvent::Button button = blink::WebMouseEvent::ButtonLeft;
|
| + blink::WebMouseEvent::Button button = blink::WebMouseEvent::Button::Left;
|
| WindowOpenDisposition disposition = NEW_WINDOW;
|
| RunTest(browser(), GetWindowOpenURL(), modifiers, button, disposition);
|
| }
|
| @@ -2441,7 +2441,7 @@ IN_PROC_BROWSER_TEST_F(ClickModifierTest, WindowOpenControlClickTest) {
|
| #else
|
| int modifiers = blink::WebInputEvent::ControlKey;
|
| #endif
|
| - blink::WebMouseEvent::Button button = blink::WebMouseEvent::ButtonLeft;
|
| + blink::WebMouseEvent::Button button = blink::WebMouseEvent::Button::Left;
|
| WindowOpenDisposition disposition = NEW_BACKGROUND_TAB;
|
| RunTest(browser(), GetWindowOpenURL(), modifiers, button, disposition);
|
| }
|
| @@ -2455,7 +2455,7 @@ IN_PROC_BROWSER_TEST_F(ClickModifierTest, WindowOpenControlShiftClickTest) {
|
| int modifiers = blink::WebInputEvent::ControlKey;
|
| #endif
|
| modifiers |= blink::WebInputEvent::ShiftKey;
|
| - blink::WebMouseEvent::Button button = blink::WebMouseEvent::ButtonLeft;
|
| + blink::WebMouseEvent::Button button = blink::WebMouseEvent::Button::Left;
|
| WindowOpenDisposition disposition = NEW_FOREGROUND_TAB;
|
| RunTest(browser(), GetWindowOpenURL(), modifiers, button, disposition);
|
| }
|
| @@ -2469,7 +2469,7 @@ IN_PROC_BROWSER_TEST_F(ClickModifierTest, WindowOpenControlShiftClickTest) {
|
| #endif
|
| IN_PROC_BROWSER_TEST_F(ClickModifierTest, MAYBE_WindowOpenMiddleClickTest) {
|
| int modifiers = 0;
|
| - blink::WebMouseEvent::Button button = blink::WebMouseEvent::ButtonMiddle;
|
| + blink::WebMouseEvent::Button button = blink::WebMouseEvent::Button::Middle;
|
| WindowOpenDisposition disposition = NEW_BACKGROUND_TAB;
|
| RunTest(browser(), GetWindowOpenURL(), modifiers, button, disposition);
|
| }
|
| @@ -2477,7 +2477,7 @@ IN_PROC_BROWSER_TEST_F(ClickModifierTest, MAYBE_WindowOpenMiddleClickTest) {
|
| // Shift-middle-clicks open in a foreground tab.
|
| IN_PROC_BROWSER_TEST_F(ClickModifierTest, WindowOpenShiftMiddleClickTest) {
|
| int modifiers = blink::WebInputEvent::ShiftKey;
|
| - blink::WebMouseEvent::Button button = blink::WebMouseEvent::ButtonMiddle;
|
| + blink::WebMouseEvent::Button button = blink::WebMouseEvent::Button::Middle;
|
| WindowOpenDisposition disposition = NEW_FOREGROUND_TAB;
|
| RunTest(browser(), GetWindowOpenURL(), modifiers, button, disposition);
|
| }
|
| @@ -2486,7 +2486,7 @@ IN_PROC_BROWSER_TEST_F(ClickModifierTest, WindowOpenShiftMiddleClickTest) {
|
|
|
| IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefBasicClickTest) {
|
| int modifiers = 0;
|
| - blink::WebMouseEvent::Button button = blink::WebMouseEvent::ButtonLeft;
|
| + blink::WebMouseEvent::Button button = blink::WebMouseEvent::Button::Left;
|
| WindowOpenDisposition disposition = CURRENT_TAB;
|
| RunTest(browser(), GetHrefURL(), modifiers, button, disposition);
|
| }
|
| @@ -2497,7 +2497,7 @@ IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefBasicClickTest) {
|
| // Shift-clicks open in a new window.
|
| IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefShiftClickTest) {
|
| int modifiers = blink::WebInputEvent::ShiftKey;
|
| - blink::WebMouseEvent::Button button = blink::WebMouseEvent::ButtonLeft;
|
| + blink::WebMouseEvent::Button button = blink::WebMouseEvent::Button::Left;
|
| WindowOpenDisposition disposition = NEW_WINDOW;
|
| RunTest(browser(), GetHrefURL(), modifiers, button, disposition);
|
| }
|
| @@ -2510,7 +2510,7 @@ IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefControlClickTest) {
|
| #else
|
| int modifiers = blink::WebInputEvent::ControlKey;
|
| #endif
|
| - blink::WebMouseEvent::Button button = blink::WebMouseEvent::ButtonLeft;
|
| + blink::WebMouseEvent::Button button = blink::WebMouseEvent::Button::Left;
|
| WindowOpenDisposition disposition = NEW_BACKGROUND_TAB;
|
| RunTest(browser(), GetHrefURL(), modifiers, button, disposition);
|
| }
|
| @@ -2525,7 +2525,7 @@ IN_PROC_BROWSER_TEST_F(ClickModifierTest, DISABLED_HrefControlShiftClickTest) {
|
| int modifiers = blink::WebInputEvent::ControlKey;
|
| #endif
|
| modifiers |= blink::WebInputEvent::ShiftKey;
|
| - blink::WebMouseEvent::Button button = blink::WebMouseEvent::ButtonLeft;
|
| + blink::WebMouseEvent::Button button = blink::WebMouseEvent::Button::Left;
|
| WindowOpenDisposition disposition = NEW_FOREGROUND_TAB;
|
| RunTest(browser(), GetHrefURL(), modifiers, button, disposition);
|
| }
|
| @@ -2533,7 +2533,7 @@ IN_PROC_BROWSER_TEST_F(ClickModifierTest, DISABLED_HrefControlShiftClickTest) {
|
| // Middle-clicks open in a background tab.
|
| IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefMiddleClickTest) {
|
| int modifiers = 0;
|
| - blink::WebMouseEvent::Button button = blink::WebMouseEvent::ButtonMiddle;
|
| + blink::WebMouseEvent::Button button = blink::WebMouseEvent::Button::Middle;
|
| WindowOpenDisposition disposition = NEW_BACKGROUND_TAB;
|
| RunTest(browser(), GetHrefURL(), modifiers, button, disposition);
|
| }
|
| @@ -2542,7 +2542,7 @@ IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefMiddleClickTest) {
|
| // http://crbug.com/396347
|
| IN_PROC_BROWSER_TEST_F(ClickModifierTest, DISABLED_HrefShiftMiddleClickTest) {
|
| int modifiers = blink::WebInputEvent::ShiftKey;
|
| - blink::WebMouseEvent::Button button = blink::WebMouseEvent::ButtonMiddle;
|
| + blink::WebMouseEvent::Button button = blink::WebMouseEvent::Button::Middle;
|
| WindowOpenDisposition disposition = NEW_FOREGROUND_TAB;
|
| RunTest(browser(), GetHrefURL(), modifiers, button, disposition);
|
| }
|
|
|