Creates BrowserTabStripTracker to consolidate common code

chrome/browser/extensions/api/debugger/debugger_api.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.
 
 // Implements the Chrome Extensions Debugger API.
 
 #include "chrome/browser/extensions/api/debugger/debugger_api.h"
 
 #include <map>
 #include <set>
@@ skipping 11 matching lines @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/devtools/devtools_target_impl.h"
 #include "chrome/browser/extensions/api/debugger/debugger_api_constants.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/browser_list_observer.h"
+#include "chrome/browser/ui/browser_tab_strip_tracker.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 126 matching lines @@
   // InfoBarDismissed() will have closed us already.
   return false;
 }
 
 // GlobalConfirmInfoBar -------------------------------------------------------
 
 // GlobalConfirmInfobar is shown for every tab in every browser until it
 // is dismissed or the object itself is destroyed.
 // It listens to all tabs in all browsers and adds/removes confirm infobar
 // to each of the tabs.
-class GlobalConfirmInfoBar : public chrome::BrowserListObserver,
-                             public TabStripModelObserver,
+class GlobalConfirmInfoBar : public TabStripModelObserver,
                              public infobars::InfoBarManager::Observer {
  public:
   GlobalConfirmInfoBar(const base::Closure& dismissed_callback,
                        const std::string& client_name);
   ~GlobalConfirmInfoBar() override;
 
  private:
   using InfoBarMap = std::map<InfoBarService*, infobars::InfoBar*>;
 
-  // chrome::BrowserListObserver:
-  void OnBrowserAdded(Browser* browser) override;
-  void OnBrowserRemoved(Browser* browser) override;
-
   // TabStripModelObserver:
   void TabInsertedAt(content::WebContents* web_contents,
                      int index,
                      bool foreground) override;
 
   // infobars::InfoBarManager::Observer:
   void OnInfoBarRemoved(infobars::InfoBar* infobar, bool animate) override;
   void OnManagerShuttingDown(infobars::InfoBarManager* manager) override;
   // We don't override OnInfoBarReplaces, as extension debugger api infobar
   // should not be involved in replacements.
 
   base::Closure dismissed_callback_;
   std::string client_name_;
   InfoBarMap infobars_;
+  BrowserTabStripTracker browser_tab_strip_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(GlobalConfirmInfoBar);
 };
 
 GlobalConfirmInfoBar::GlobalConfirmInfoBar(
     const base::Closure& dismissed_callback,
     const std::string& client_name)
-    : dismissed_callback_(dismissed_callback), client_name_(client_name) {
-  BrowserList::AddObserver(this);
-  for (Browser* browser : *BrowserList::GetInstance(chrome::GetActiveDesktop()))
-    OnBrowserAdded(browser);
+    : dismissed_callback_(dismissed_callback),
+      client_name_(client_name),
+      browser_tab_strip_tracker_(this, nullptr, nullptr) {
+  browser_tab_strip_tracker_.Init(
+      BrowserTabStripTracker::InitWith::BROWSERS_IN_ACTIVE_DESKTOP);
 }
 
 GlobalConfirmInfoBar::~GlobalConfirmInfoBar() {
   while (!infobars_.empty()) {
     InfoBarMap::iterator it = infobars_.begin();
     it->first->RemoveInfoBar(it->second);
   }
-
-  for (Browser* browser : *BrowserList::GetInstance(chrome::GetActiveDesktop()))
-    OnBrowserRemoved(browser);
-  BrowserList::RemoveObserver(this);
-}
-
-void GlobalConfirmInfoBar::OnBrowserAdded(Browser* browser) {
-  TabStripModel* tab_strip_model = browser->tab_strip_model();
-  tab_strip_model->AddObserver(this);
-
-  for (int index = 0; index < tab_strip_model->count(); ++index)
-    TabInsertedAt(tab_strip_model->GetWebContentsAt(index), index, false);
-}
-
-void GlobalConfirmInfoBar::OnBrowserRemoved(Browser* browser) {
-  browser->tab_strip_model()->RemoveObserver(this);
 }
 
 void GlobalConfirmInfoBar::TabInsertedAt(content::WebContents* web_contents,
                                          int index,
                                          bool foreground) {
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents);
   // WebContents from the tab strip must have the infobar service.
   DCHECK(infobar_service);
 
@@ skipping 514 matching lines @@
     const std::vector<DevToolsTargetImpl*>& target_list) {
   scoped_ptr<base::ListValue> result(new base::ListValue());
   for (size_t i = 0; i < target_list.size(); ++i)
     result->Append(SerializeTarget(*target_list[i]));
   STLDeleteContainerPointers(target_list.begin(), target_list.end());
   SetResult(result.release());
   SendResponse(true);
 }
 
 }  // namespace extensions