Remove HostDesktopType from Browser::CreateParams

chrome/browser/chromeos/first_run/goodies_displayer_browsertest.cc

 // Copyright 2015 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 "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/first_run/goodies_displayer.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ skipping 12 matching lines @@
  protected:
   ~GoodiesDisplayerBrowserTest() override {
     first_run::GoodiesDisplayer::Delete();
   }
 
   // Set up windowless browser and GoodiesDisplayer.  |delta_days| is +/- delta
   // in days from kMaxDaysAfterOobeForGoodies; <= 0: "show", > 0: "don't show".
   Browser* CreateBrowserAndDisplayer(int delta_days) {
     // Create a new browser and wait for completion.
     ui_test_utils::BrowserAddedObserver browser_added_observer;
-    Browser* browser = new Browser(Browser::CreateParams(
-        ProfileManager::GetActiveUserProfile(), chrome::GetActiveDesktop()));
+    Browser* browser = new Browser(
+        Browser::CreateParams(ProfileManager::GetActiveUserProfile()));
     browser_added_observer.WaitForSingleNewBrowser();
 
     // Set up Goodies Displayer and set fake age of device.
     setup_info_.days_since_oobe =
         first_run::GoodiesDisplayer::kMaxDaysAfterOobeForGoodies + delta_days;
     first_run::GoodiesDisplayer::InitForTesting(&setup_info_);
     WaitForGoodiesSetup();
 
     return browser;
   }
@@ skipping 57 matching lines @@
 
 // Tests that the Goodies page is shown, only once, on non-incognito browser
 // when device isn't too old.
 IN_PROC_BROWSER_TEST_F(GoodiesDisplayerBrowserTest, DisplayGoodies) {
   ASSERT_EQ(0u, chrome::GetTotalBrowserCount());
   Browser* browser = CreateBrowserAndDisplayer(-1);
   ASSERT_EQ(1u, chrome::GetTotalBrowserCount());
 
   // Shouldn't show Goodies tab in incognito mode.
   Browser* incognito_browser = new Browser(
-      Browser::CreateParams(browser->profile()->GetOffTheRecordProfile(),
-                            chrome::GetActiveDesktop()));
+      Browser::CreateParams(browser->profile()->GetOffTheRecordProfile()));
   ASSERT_EQ(2u, chrome::GetTotalBrowserCount());
   AddBlankTabAndShow(incognito_browser);
   ExpectTabCounts(incognito_browser, 1, 0);
   CloseBrowserSynchronously(incognito_browser);
   ASSERT_EQ(1u, chrome::GetTotalBrowserCount());
   EXPECT_TRUE(g_browser_process->local_state()->GetBoolean(
       prefs::kCanShowOobeGoodiesPage));
 
   // First logged-in browser shows Goodies.
   AddBlankTabAndShow(browser);
   ExpectTabCounts(browser, 2, 1);
   EXPECT_FALSE(g_browser_process->local_state()->GetBoolean(
       prefs::kCanShowOobeGoodiesPage));
 
   // Next time a browser is opened, no Goodies.
   Browser* browser2 = CreateBrowser(browser->profile());
   ASSERT_EQ(2u, chrome::GetTotalBrowserCount());
   ExpectTabCounts(browser2, 1, 0);
 }
 
 }  // namespace chromeos