Remove HostDesktopType from BrowserList::GetInstance()

chrome/browser/sessions/tab_restore_browsertest.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 "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
@@ skipping 73 matching lines @@
     url1_ = ui_test_utils::GetTestUrl(
         base::FilePath().AppendASCII("session_history"),
         base::FilePath().AppendASCII("bot1.html"));
     url2_ = ui_test_utils::GetTestUrl(
         base::FilePath().AppendASCII("session_history"),
         base::FilePath().AppendASCII("bot2.html"));
   }
 
  protected:
   void SetUpOnMainThread() override {
-    active_browser_list_ = BrowserList::GetInstance(chrome::GetActiveDesktop());
+    active_browser_list_ = BrowserList::GetInstance();
     InProcessBrowserTest::SetUpOnMainThread();
   }
 
   Browser* GetBrowser(int index) {
     CHECK(static_cast<int>(active_browser_list_->size()) > index);
     return active_browser_list_->get(index);
   }
 
   // Adds tabs to the given browser, all navigated to url1_. Returns
   // the final number of tabs.
@@ skipping 349 matching lines @@
   // And make sure the URLs match.
   EXPECT_EQ(http_url2,
             browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
   GoBack(browser());
   EXPECT_EQ(http_url1,
             browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
 // See crbug.com/248574
 #if defined(OS_WIN)
-#define MAYBE_RestoreCrossSiteWithExistingSiteInstance DISABLED_RestoreCrossSiteWithExistingSiteInstance
+#define MAYBE_RestoreCrossSiteWithExistingSiteInstance \
+  DISABLED_RestoreCrossSiteWithExistingSiteInstance
 #else
-#define MAYBE_RestoreCrossSiteWithExistingSiteInstance RestoreCrossSiteWithExistingSiteInstance
+#define MAYBE_RestoreCrossSiteWithExistingSiteInstance \
+  RestoreCrossSiteWithExistingSiteInstance
 #endif
 
 // Tests that the SiteInstances used for entries in a restored tab's history
 // are given appropriate max page IDs, even if the renderer for the entry
 // already exists.  (Bug 1204135)
 IN_PROC_BROWSER_TEST_F(TabRestoreTest,
                        MAYBE_RestoreCrossSiteWithExistingSiteInstance) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
   GURL http_url1(embedded_test_server()->GetURL("/title1.html"));
@@ skipping 153 matching lines @@
   while (browser()->tab_strip_model()->count())
     CloseTab(0);
 }
 
 // Verifies restoring a tab works on startup.
 IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreOnStartup) {
   ASSERT_NO_FATAL_FAILURE(RestoreTab(0, 1));
   EXPECT_EQ(url1_,
             browser()->tab_strip_model()->GetWebContentsAt(1)->GetURL());
 }