| Index: chrome/browser/app_controller_mac_browsertest.mm
|
| diff --git a/chrome/browser/app_controller_mac_browsertest.mm b/chrome/browser/app_controller_mac_browsertest.mm
|
| index d9fc6b4fcffc6dda9815fd1bbb42b3b4657a7145..f6abb9ff564d4a04eb94a60348ca7478b4bc8676 100644
|
| --- a/chrome/browser/app_controller_mac_browsertest.mm
|
| +++ b/chrome/browser/app_controller_mac_browsertest.mm
|
| @@ -642,7 +642,7 @@ IN_PROC_BROWSER_TEST_F(AppControllerHandoffBrowserTest, TestHandoffURLs) {
|
| // Test that opening a new tab updates the handoff URL.
|
| GURL test_url2 = embedded_test_server()->GetURL("/title2.html");
|
| chrome::NavigateParams params(browser(), test_url2, ui::PAGE_TRANSITION_LINK);
|
| - params.disposition = NEW_FOREGROUND_TAB;
|
| + params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
|
| ui_test_utils::NavigateToURL(¶ms);
|
| EXPECT_EQ(g_handoff_url, test_url2);
|
|
|
| @@ -657,7 +657,7 @@ IN_PROC_BROWSER_TEST_F(AppControllerHandoffBrowserTest, TestHandoffURLs) {
|
| // Test that opening a new browser window updates the handoff URL.
|
| GURL test_url3 = embedded_test_server()->GetURL("/title3.html");
|
| ui_test_utils::NavigateToURLWithDisposition(
|
| - browser(), GURL(test_url3), NEW_WINDOW,
|
| + browser(), GURL(test_url3), WindowOpenDisposition::NEW_WINDOW,
|
| ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
|
| EXPECT_EQ(g_handoff_url, test_url3);
|
|
|
| @@ -673,7 +673,7 @@ IN_PROC_BROWSER_TEST_F(AppControllerHandoffBrowserTest, TestHandoffURLs) {
|
| // The URLs of incognito windows should not be passed to Handoff.
|
| GURL test_url4 = embedded_test_server()->GetURL("/simple.html");
|
| ui_test_utils::NavigateToURLWithDisposition(
|
| - browser(), GURL(test_url4), OFF_THE_RECORD,
|
| + browser(), GURL(test_url4), WindowOpenDisposition::OFF_THE_RECORD,
|
| ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
|
| EXPECT_EQ(g_handoff_url, GURL());
|
|
|
| @@ -681,7 +681,7 @@ IN_PROC_BROWSER_TEST_F(AppControllerHandoffBrowserTest, TestHandoffURLs) {
|
| EXPECT_EQ(2u, active_browser_list->size());
|
| Browser* browser3 = active_browser_list->get(1);
|
| ui_test_utils::NavigateToURLWithDisposition(
|
| - browser3, test_url4, NEW_FOREGROUND_TAB,
|
| + browser3, test_url4, WindowOpenDisposition::NEW_FOREGROUND_TAB,
|
| ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
|
| EXPECT_EQ(g_handoff_url, GURL());
|
|
|
|
|