Remove HostDesktopType from Browser::CreateParams

chrome/browser/sessions/session_restore_browsertest_chromeos.cc

 // Copyright (c) 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 <list>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 41 matching lines @@
         CloseBrowserSynchronously(*iter);
         browser_list_.erase(iter);
         return true;
       }
     }
     return false;
   }
 
   Browser::CreateParams CreateParamsForApp(const std::string name,
                                            bool trusted) {
-    return Browser::CreateParams::CreateForApp(
-        name, trusted, gfx::Rect(), profile(), chrome::GetActiveDesktop());
+    return Browser::CreateParams::CreateForApp(name, trusted, gfx::Rect(),
+                                               profile());
   }
 
   // Turn on session restore before we restart.
   void TurnOnSessionRestore() {
     SessionStartupPref::SetStartupPref(
         browser()->profile(), SessionStartupPref(SessionStartupPref::LAST));
   }
 
   Profile* profile() { return browser()->profile(); }
 
   std::list<Browser*> browser_list_;
 };
 
 // Thse tests are in pairs. The PRE_ test creates some browser windows and
 // the following test confirms that the correct windows are restored after a
 // restart.
 
 IN_PROC_BROWSER_TEST_F(SessionRestoreTestChromeOS, PRE_RestoreBrowserWindows) {
   // One browser window is always created by default.
   EXPECT_TRUE(browser());
   // Create a second normal browser window.
+  CreateBrowserWithParams(Browser::CreateParams(profile()));
+  // Create a third incognito browser window which should not get restored.
   CreateBrowserWithParams(
-      Browser::CreateParams(profile(), chrome::GetActiveDesktop()));
-  // Create a third incognito browser window which should not get restored.
-  CreateBrowserWithParams(Browser::CreateParams(
-      profile()->GetOffTheRecordProfile(), chrome::GetActiveDesktop()));
+      Browser::CreateParams(profile()->GetOffTheRecordProfile()));
   TurnOnSessionRestore();
 }
 
 IN_PROC_BROWSER_TEST_F(SessionRestoreTestChromeOS, RestoreBrowserWindows) {
   size_t total_count = 0;
   size_t incognito_count = 0;
   for (auto* browser : *BrowserList::GetInstance()) {
     ++total_count;
     if (browser->profile()->IsOffTheRecord())
       ++incognito_count;
@@ skipping 27 matching lines @@
   }
   EXPECT_EQ(1u, app1_count);
   EXPECT_EQ(2u, app2_count);  // Only the trusted app windows are restored.
   EXPECT_EQ(4u, total_count);  // Default browser() + 3 app windows
 }
 
 IN_PROC_BROWSER_TEST_F(SessionRestoreTestChromeOS, PRE_RestoreMaximized) {
   // One browser window is always created by default.
   ASSERT_TRUE(browser());
   // Create a second browser window and maximize it.
-  Browser* browser2 = CreateBrowserWithParams(
-      Browser::CreateParams(profile(), chrome::GetActiveDesktop()));
+  Browser* browser2 = CreateBrowserWithParams(Browser::CreateParams(profile()));
   browser2->window()->Maximize();
 
   // Create two app popup windows and maximize the second one.
   Browser* app_browser1 =
       CreateBrowserWithParams(CreateParamsForApp(test_app_popup_name1, true));
   Browser* app_browser2 =
       CreateBrowserWithParams(CreateParamsForApp(test_app_popup_name1, true));
   app_browser2->window()->Maximize();
 
   EXPECT_FALSE(browser()->window()->IsMaximized());
   EXPECT_TRUE(browser2->window()->IsMaximized());
   EXPECT_FALSE(app_browser1->window()->IsMaximized());
   EXPECT_TRUE(app_browser2->window()->IsMaximized());
 
   TurnOnSessionRestore();
 }
 
 IN_PROC_BROWSER_TEST_F(SessionRestoreTestChromeOS, RestoreMaximized) {
   size_t total_count = 0;
   size_t maximized_count = 0;
   for (auto* browser : *BrowserList::GetInstance()) {
     ++total_count;
     if (browser->window()->IsMaximized())
       ++maximized_count;
   }
   EXPECT_EQ(4u, total_count);
   EXPECT_EQ(2u, maximized_count);
 }