Remove HostDesktopType from Browser::CreateParams

chrome/browser/sessions/session_restore_browsertest.cc

 // Copyright 2012 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 <vector>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
@@ skipping 118 matching lines @@
     Profile* profile = browser->profile();
 
     // Close the browser.
     g_browser_process->AddRefModule();
     CloseBrowserSynchronously(browser);
 
     // Create a new window, which should trigger session restore.
     ui_test_utils::BrowserAddedObserver window_observer;
     SessionRestoreTestHelper restore_observer;
     if (url.is_empty()) {
-      chrome::NewEmptyWindow(profile, chrome::HOST_DESKTOP_TYPE_NATIVE);
+      chrome::NewEmptyWindow(profile);
     } else {
       chrome::NavigateParams params(profile,
                                     url,
                                     ui::PAGE_TRANSITION_LINK);
       chrome::Navigate(&params);
     }
     Browser* new_browser = window_observer.WaitForSingleNewBrowser();
     // Stop loading anything more if we are running out of space.
     if (!no_memory_pressure) {
       base::MemoryPressureListener::NotifyMemoryPressure(
@@ skipping 326 matching lines @@
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Turn on session restore.
   SessionStartupPref::SetStartupPref(
       browser()->profile(),
       SessionStartupPref(SessionStartupPref::LAST));
 
   // Create a new popup.
   Profile* profile = browser()->profile();
   Browser* popup =
-      new Browser(Browser::CreateParams(Browser::TYPE_POPUP, profile,
-                                        browser()->host_desktop_type()));
+      new Browser(Browser::CreateParams(Browser::TYPE_POPUP, profile));
   popup->window()->Show();
 
   // Close the browser.
   CloseBrowserSynchronously(browser());
 
   // Create a new window, which should trigger session restore.
   ui_test_utils::BrowserAddedObserver observer;
   chrome::NewWindow(popup);
   Browser* new_browser = observer.WaitForSingleNewBrowser();
 
@@ skipping 310 matching lines @@
   }
   window.tabs.push_back(&tab2);
 
   // Leave tab3 empty. Should have no effect on restored session, but simulates
   // partially complete foreign session data.
   sessions::SessionTab tab3;
   window.tabs.push_back(&tab3);
 
   session.push_back(static_cast<const sessions::SessionWindow*>(&window));
   ui_test_utils::BrowserAddedObserver window_observer;
-  std::vector<Browser*> browsers =
-      SessionRestore::RestoreForeignSessionWindows(
-          profile, browser()->host_desktop_type(), session.begin(),
-          session.end());
+  std::vector<Browser*> browsers = SessionRestore::RestoreForeignSessionWindows(
+      profile, session.begin(), session.end());
   Browser* new_browser = window_observer.WaitForSingleNewBrowser();
   ASSERT_TRUE(new_browser);
   ASSERT_EQ(2u, active_browser_list_->size());
   ASSERT_EQ(2, new_browser->tab_strip_model()->count());
 
   ASSERT_EQ(1u, browsers.size());
   ASSERT_TRUE(browsers[0]);
   ASSERT_EQ(2, browsers[0]->tab_strip_model()->count());
 
   content::WebContents* web_contents_1 =
@@ skipping 426 matching lines @@
   chrome::CloseTab(new_browser);
   ASSERT_EQ(1, new_browser->tab_strip_model()->count());
   ASSERT_EQ(0, new_browser->tab_strip_model()->active_index());
   // Use the existing tab to navigate away, so that we can verify it was really
   // clobbered.
   ui_test_utils::NavigateToURL(new_browser, url3_);
 
   // Restore the session again, clobbering the existing tab.
   SessionRestore::RestoreSession(
       profile, new_browser,
-      new_browser->host_desktop_type(),
       SessionRestore::CLOBBER_CURRENT_TAB | SessionRestore::SYNCHRONOUS,
       std::vector<GURL>());
 
   // The pinned tab is the selected tab.
   ASSERT_EQ(2, new_browser->tab_strip_model()->count());
   EXPECT_EQ(0, new_browser->tab_strip_model()->active_index());
   EXPECT_EQ(url1_,
             new_browser->tab_strip_model()->GetActiveWebContents()->GetURL());
   EXPECT_EQ(url2_,
             new_browser->tab_strip_model()->GetWebContentsAt(1)->GetURL());
@@ skipping 38 matching lines @@
   // Close the first tab.
   chrome::CloseTab(new_browser);
   ASSERT_EQ(1, new_browser->tab_strip_model()->count());
   ASSERT_EQ(0, new_browser->tab_strip_model()->active_index());
   // Use the existing tab to navigate to the NTP.
   ui_test_utils::NavigateToURL(new_browser, GURL(chrome::kChromeUINewTabURL));
 
   // Restore the session again, clobbering the existing tab.
   SessionRestore::RestoreSession(
       profile, new_browser,
-      new_browser->host_desktop_type(),
       SessionRestore::CLOBBER_CURRENT_TAB | SessionRestore::SYNCHRONOUS,
       std::vector<GURL>());
 
   // 2 tabs should have been restored, with the existing tab clobbered, giving
   // us a total of 2 tabs.
   ASSERT_EQ(2, new_browser->tab_strip_model()->count());
   EXPECT_EQ(1, new_browser->tab_strip_model()->active_index());
   EXPECT_EQ(url1_,
             new_browser->tab_strip_model()->GetWebContentsAt(0)->GetURL());
   EXPECT_EQ(url2_,
@@ skipping 78 matching lines @@
     browser()->tab_strip_model()->ActivateTabAt(i, true);
 
   // Close the browser.
   g_browser_process->AddRefModule();
   CloseBrowserSynchronously(browser());
 
   StartObserving(kExpectedNumTabs);
 
   // 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);
   Browser* new_browser = window_observer.WaitForSingleNewBrowser();
   ASSERT_TRUE(new_browser);
   WaitForAllTabsToStartLoading();
   g_browser_process->ReleaseModule();
 
   ASSERT_EQ(kExpectedNumTabs, web_contents().size());
   // Test that we have observed the tabs being loaded in the inverse order of
   // their activation (MRU). Also validate that their last active time is in the
   // correct order.
   for (size_t i = 0; i < web_contents().size(); i++) {
@@ skipping 23 matching lines @@
   // Close the browser that gets opened automatically so we can track the order
   // of loading of the tabs.
   g_browser_process->AddRefModule();
   CloseBrowserSynchronously(browser());
   // We have an extra tab that is added when the test starts, which gets ignored
   // later when we test for proper order.
   StartObserving(kExpectedNumTabs + 1);
 
   // 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);
   Browser* new_browser = window_observer.WaitForSingleNewBrowser();
   ASSERT_TRUE(new_browser);
   WaitForAllTabsToStartLoading();
   g_browser_process->ReleaseModule();
 
   ASSERT_EQ(kExpectedNumTabs + 1, web_contents().size());
 
   // Test that we have observed the tabs being loaded in the inverse order of
   // their activation (MRU). Also validate that their last active time is in the
   // correct order.
   //
   // Note that we ignore the first tab as it's an empty one that is added
   // automatically at the start of the test.
   for (size_t i = 1; i < web_contents().size(); i++) {
     GURL expected_url = GURL(kUrls[activation_order[kExpectedNumTabs - i]]);
     ASSERT_EQ(expected_url, web_contents()[i]->GetLastCommittedURL());
     if (i > 0) {
       ASSERT_GT(web_contents()[i - 1]->GetLastActiveTime(),
                 web_contents()[i]->GetLastActiveTime());
     }
   }
 }