Creates BrowserTabStripTracker to consolidate common code

chrome/browser/extensions/api/web_navigation/web_navigation_api.h

 // 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.
 
 // Defines the Chrome Extensions WebNavigation API functions for observing and
 // intercepting navigation events, as specified in the extension JSON API.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_WEB_NAVIGATION_WEB_NAVIGATION_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_WEB_NAVIGATION_WEB_NAVIGATION_API_H_
 
 #include <map>
 #include <set>
 
 #include "base/compiler_specific.h"
 #include "chrome/browser/extensions/api/web_navigation/frame_navigation_state.h"
 #include "chrome/browser/extensions/chrome_extension_function.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/browser_list_observer.h"
+#include "chrome/browser/ui/browser_tab_strip_tracker.h"
+#include "chrome/browser/ui/browser_tab_strip_tracker_delegate.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 #include "extensions/browser/browser_context_keyed_api_factory.h"
 #include "extensions/browser/event_router.h"
 #include "url/gurl.h"
 
 struct RetargetingDetails;
@@ skipping 76 matching lines @@
 
   // Used for tracking registrations to redirect notifications.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(WebNavigationTabObserver);
 };
 
 // Observes navigation notifications and routes them as events to the extension
 // system.
 class WebNavigationEventRouter : public TabStripModelObserver,
-                                 public chrome::BrowserListObserver,
+                                 public BrowserTabStripTrackerDelegate,
                                  public content::NotificationObserver {
  public:
   explicit WebNavigationEventRouter(Profile* profile);
   ~WebNavigationEventRouter() override;
 
  private:
   // Used to cache the information about newly created WebContents objects.
   struct PendingWebContents{
     PendingWebContents();
     PendingWebContents(content::WebContents* source_web_contents,
                        content::RenderFrameHost* source_frame_host,
                        content::WebContents* target_web_contents,
                        const GURL& target_url);
     ~PendingWebContents();
 
     content::WebContents* source_web_contents;
     content::RenderFrameHost* source_frame_host;
     content::WebContents* target_web_contents;
     GURL target_url;
   };
 
+  // BrowserTabStripTrackerDelegate implementation.
+  bool ShouldTrackBrowser(Browser* browser) override;
+
   // TabStripModelObserver implementation.
   void TabReplacedAt(TabStripModel* tab_strip_model,
                      content::WebContents* old_contents,
                      content::WebContents* new_contents,
                      int index) override;
 
-  // chrome::BrowserListObserver implementation.
-  void OnBrowserAdded(Browser* browser) override;
-  void OnBrowserRemoved(Browser* browser) override;
-
   // content::NotificationObserver implementation.
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
   // Handler for the NOTIFICATION_RETARGETING event. The method takes the
   // details of such an event and stores them for the later
   // NOTIFICATION_TAB_ADDED event.
   void Retargeting(const RetargetingDetails* details);
 
   // Handler for the NOTIFICATION_TAB_ADDED event. The method takes the details
   // of such an event and creates a JSON formated extension event from it.
   void TabAdded(content::WebContents* tab);
 
   // Handler for NOTIFICATION_WEB_CONTENTS_DESTROYED. If |tab| is in
   // |pending_web_contents_|, it is removed.
   void TabDestroyed(content::WebContents* tab);
 
   // Mapping pointers to WebContents objects to information about how they got
   // created.
   std::map<content::WebContents*, PendingWebContents> pending_web_contents_;
 
   // Used for tracking registrations to navigation notifications.
   content::NotificationRegistrar registrar_;
 
   // The profile that owns us via ExtensionService.
   Profile* profile_;
 
+  BrowserTabStripTracker browser_tab_strip_tracker_;
+
   DISALLOW_COPY_AND_ASSIGN(WebNavigationEventRouter);
 };
 
 // API function that returns the state of a given frame.
 class WebNavigationGetFrameFunction : public ChromeSyncExtensionFunction {
   ~WebNavigationGetFrameFunction() override {}
   bool RunSync() override;
   DECLARE_EXTENSION_FUNCTION("webNavigation.getFrame", WEBNAVIGATION_GETFRAME)
 };
 
@@ skipping 33 matching lines @@
 
   // Created lazily upon OnListenerAdded.
   scoped_ptr<WebNavigationEventRouter> web_navigation_event_router_;
 
   DISALLOW_COPY_AND_ASSIGN(WebNavigationAPI);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_WEB_NAVIGATION_WEB_NAVIGATION_API_H_