Remove HostDesktopType from BrowserList::GetInstance()

chrome/browser/ui/browser_tab_restorer.cc

 // Copyright 2014 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/macros.h"
 #include "base/metrics/user_metrics_action.h"
 #include "base/supports_user_data.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 37 matching lines @@
   void OnBrowserRemoved(Browser* browser) override;
 
   Browser* browser_;
   sessions::TabRestoreService* tab_restore_service_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserTabRestorer);
 };
 
 BrowserTabRestorer::~BrowserTabRestorer() {
   tab_restore_service_->RemoveObserver(this);
-  BrowserList::GetInstance(browser_->host_desktop_type())->RemoveObserver(this);
+  BrowserList::GetInstance()->RemoveObserver(this);
 }
 
 // static
 void BrowserTabRestorer::CreateIfNecessary(Browser* browser) {
   DCHECK(browser);
   if (browser->profile()->GetUserData(kBrowserTabRestorerKey))
     return;  // Only allow one restore for a given profile at a time.
 
   // BrowserTabRestorer is deleted at the appropriate time.
   new BrowserTabRestorer(browser);
 }
 
 BrowserTabRestorer::BrowserTabRestorer(Browser* browser)
     : browser_(browser),
       tab_restore_service_(
           TabRestoreServiceFactory::GetForProfile(browser->profile())) {
   DCHECK(tab_restore_service_);
   DCHECK(!tab_restore_service_->IsLoaded());
   tab_restore_service_->AddObserver(this);
-  BrowserList::GetInstance(browser->host_desktop_type())->AddObserver(this);
+  BrowserList::GetInstance()->AddObserver(this);
   browser_->profile()->SetUserData(kBrowserTabRestorerKey, this);
   tab_restore_service_->LoadTabsFromLastSession();
 }
 
 void BrowserTabRestorer::TabRestoreServiceChanged(
     sessions::TabRestoreService* service) {}
 
 void BrowserTabRestorer::TabRestoreServiceDestroyed(
     sessions::TabRestoreService* service) {}
 
@@ skipping 21 matching lines @@
   if (service->IsLoaded()) {
     service->RestoreMostRecentEntry(browser->live_tab_context(),
                                     browser->host_desktop_type());
     return;
   }
 
   BrowserTabRestorer::CreateIfNecessary(browser);
 }
 
 }  // namespace chrome