| Index: chrome/browser/sessions/session_restore_browsertest.cc
|
| diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc
|
| index 6b8b5745b8039cb2c47906d5de31b8bd17ba4a99..fcb6cddecadef8ab1d8dbdfb93e85d8613b371ea 100644
|
| --- a/chrome/browser/sessions/session_restore_browsertest.cc
|
| +++ b/chrome/browser/sessions/session_restore_browsertest.cc
|
| @@ -127,7 +127,7 @@ class SessionRestoreTest : public InProcessBrowserTest {
|
| ui_test_utils::BrowserAddedObserver window_observer;
|
| SessionRestoreTestHelper restore_observer;
|
| if (url.is_empty()) {
|
| - chrome::NewEmptyWindow(profile, chrome::HOST_DESKTOP_TYPE_NATIVE);
|
| + chrome::NewEmptyWindow(profile, ui::HOST_DESKTOP_TYPE_NATIVE);
|
| } else {
|
| chrome::NavigateParams params(profile,
|
| url,
|
| @@ -508,7 +508,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreIndividualTabFromWindow) {
|
| TabRestoreServiceFactory::GetForProfile(browser()->profile());
|
| service->ClearEntries();
|
|
|
| - chrome::HostDesktopType host_desktop_type = browser()->host_desktop_type();
|
| + ui::HostDesktopType host_desktop_type = browser()->host_desktop_type();
|
|
|
| browser()->window()->Close();
|
|
|
| @@ -572,7 +572,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, WindowWithOneTab) {
|
| service->ClearEntries();
|
| EXPECT_EQ(0U, service->entries().size());
|
|
|
| - chrome::HostDesktopType host_desktop_type = browser()->host_desktop_type();
|
| + ui::HostDesktopType host_desktop_type = browser()->host_desktop_type();
|
|
|
| // Close the window.
|
| browser()->window()->Close();
|
| @@ -1450,7 +1450,7 @@ IN_PROC_BROWSER_TEST_F(SmartSessionRestoreMRUTest, PRE_CorrectLoadingOrder) {
|
|
|
| // Create a new window, which should trigger session restore.
|
| ui_test_utils::BrowserAddedObserver window_observer;
|
| - chrome::NewEmptyWindow(profile, chrome::HOST_DESKTOP_TYPE_NATIVE);
|
| + chrome::NewEmptyWindow(profile, ui::HOST_DESKTOP_TYPE_NATIVE);
|
| Browser* new_browser = window_observer.WaitForSingleNewBrowser();
|
| ASSERT_TRUE(new_browser != NULL);
|
| WaitForAllTabsToStartLoading();
|
| @@ -1488,7 +1488,7 @@ IN_PROC_BROWSER_TEST_F(SmartSessionRestoreMRUTest, CorrectLoadingOrder) {
|
|
|
| // Create a new window, which should trigger session restore.
|
| ui_test_utils::BrowserAddedObserver window_observer;
|
| - chrome::NewEmptyWindow(profile, chrome::HOST_DESKTOP_TYPE_NATIVE);
|
| + chrome::NewEmptyWindow(profile, ui::HOST_DESKTOP_TYPE_NATIVE);
|
| Browser* new_browser = window_observer.WaitForSingleNewBrowser();
|
| ASSERT_TRUE(new_browser != NULL);
|
| WaitForAllTabsToStartLoading();
|
|
|