Remove HostDesktopType from BrowserList::GetInstance()

chrome/test/base/in_process_browser_test.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 "chrome/test/base/in_process_browser_test.h"
 
 #include "ash/ash_switches.h"
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 75 matching lines @@
 
 #if defined(USE_ASH)
 #include "chrome/test/base/default_ash_event_generator_delegate.h"
 #endif
 
 namespace {
 
 // Passed as value of kTestType.
 const char kBrowserTestType[] = "browser";
 
-// A BrowserListObserver that makes sure that all browsers created are on the
-// |allowed_desktop_|.
-class SingleDesktopTestObserver : public chrome::BrowserListObserver,
-                                  public base::NonThreadSafe {
- public:
-  explicit SingleDesktopTestObserver(chrome::HostDesktopType allowed_desktop);
-  ~SingleDesktopTestObserver() override;
-
-  // chrome::BrowserListObserver:
-  void OnBrowserAdded(Browser* browser) override;
-
- private:
-  chrome::HostDesktopType allowed_desktop_;
-
-  DISALLOW_COPY_AND_ASSIGN(SingleDesktopTestObserver);
-};
-
-SingleDesktopTestObserver::SingleDesktopTestObserver(
-    chrome::HostDesktopType allowed_desktop)
-        : allowed_desktop_(allowed_desktop) {
-  BrowserList::AddObserver(this);
-}
-
-SingleDesktopTestObserver::~SingleDesktopTestObserver() {
-  BrowserList::RemoveObserver(this);
-}
-
-void SingleDesktopTestObserver::OnBrowserAdded(Browser* browser) {
-  CHECK(CalledOnValidThread());
-  CHECK_EQ(browser->host_desktop_type(), allowed_desktop_);
-}
-
 }  // namespace
 
 // Library used for testing accessibility.
 const base::FilePath::CharType kAXSTesting[] =
     FILE_PATH_LITERAL("third_party/accessibility-audit/axs_testing.js");
 // JavaScript snippet to configure and run the accessibility audit.
 const char kAccessibilityTestString[] =
     "var config = new axs.AuditConfiguration();"
     "/* Disable warning about rules that cannot be checked. */"
     "config.showUnsupportedRulesWarning = false;"
@@ skipping 405 matching lines @@
   return new_command_line;
 }
 #endif
 
 void InProcessBrowserTest::RunTestOnMainThreadLoop() {
   AfterStartupTaskUtils::SetBrowserStartupIsCompleteForTesting();
 
   // Pump startup related events.
   content::RunAllPendingInMessageLoop();
 
-  chrome::HostDesktopType active_desktop = chrome::GetActiveDesktop();
-  // Self-adds/removes itself from the BrowserList observers.
-  scoped_ptr<SingleDesktopTestObserver> single_desktop_test_observer;
-  if (!multi_desktop_test_) {
-    single_desktop_test_observer.reset(
-        new SingleDesktopTestObserver(active_desktop));
-  }
-
-  const BrowserList* active_browser_list =
-      BrowserList::GetInstance(active_desktop);
+  const BrowserList* active_browser_list = BrowserList::GetInstance();
   if (!active_browser_list->empty()) {
     browser_ = active_browser_list->get(0);
 #if defined(USE_ASH)
     // There are cases where windows get created maximized by default.
     if (browser_->window()->IsMaximized())
       browser_->window()->Restore();
 #endif
     content::WaitForLoadStop(
         browser_->tab_strip_model()->GetActiveWebContents());
   }
@@ skipping 48 matching lines @@
   autorelease_pool_->Recycle();
 #endif
 
   // Sometimes tests leave Quit tasks in the MessageLoop (for shame), so let's
   // run all pending messages here to avoid preempting the QuitBrowsers tasks.
   // TODO(jbates) Once crbug.com/134753 is fixed, this can be removed because it
   // will not be possible to post Quit tasks.
   content::RunAllPendingInMessageLoop();
 
   QuitBrowsers();
-  // All BrowserLists should be empty at this point.
-  for (chrome::HostDesktopType t = chrome::HOST_DESKTOP_TYPE_FIRST;
-       t < chrome::HOST_DESKTOP_TYPE_COUNT;
-       t = static_cast<chrome::HostDesktopType>(t + 1)) {
-    CHECK(BrowserList::GetInstance(t)->empty()) << t;
-  }
+  // BrowserList should be empty at this point.
+  CHECK(BrowserList::GetInstance()->empty());
 }
 
 void InProcessBrowserTest::QuitBrowsers() {
   if (chrome::GetTotalBrowserCount() == 0) {
     chrome::NotifyAppTerminating();
     return;
   }
 
   // Invoke AttemptExit on a running message loop.
   // AttemptExit exits the message loop after everything has been
@@ skipping 10 matching lines @@
   // On the Mac, this eventually reaches
   // -[BrowserWindowController windowWillClose:], which will post a deferred
   // -autorelease on itself to ultimately destroy the Browser object. The line
   // below is necessary to pump these pending messages to ensure all Browsers
   // get deleted.
   content::RunAllPendingInMessageLoop();
   delete autorelease_pool_;
   autorelease_pool_ = NULL;
 #endif
 }