[sessions] Remove most knowledge of //chrome from core tab restore code

chrome/browser/sessions/tab_restore_service_helper.h

 // Copyright 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.
 
 #ifndef CHROME_BROWSER_SESSIONS_TAB_RESTORE_SERVICE_HELPER_H_
 #define CHROME_BROWSER_SESSIONS_TAB_RESTORE_SERVICE_HELPER_H_
 
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "components/sessions/session_id.h"
 #include "components/sessions/session_types.h"
 
 class Profile;
 class TabRestoreService;
 class TabRestoreServiceDelegate;
 class TabRestoreServiceObserver;
 class TimeFactory;
 
 namespace content {
 class NavigationController;
 class WebContents;
 }
 
+namespace sessions {
+class TabRestoreServiceClient;
+}
+
 // Helper class used to implement InMemoryTabRestoreService and
 // PersistentTabRestoreService. See tab_restore_service.h for method-level
 // comments.
 class TabRestoreServiceHelper {
  public:
   typedef TabRestoreService::Entries Entries;
   typedef TabRestoreService::Entry Entry;
   typedef TabRestoreService::Tab Tab;
   typedef TabRestoreService::TimeFactory TimeFactory;
   typedef TabRestoreService::Window Window;
@@ skipping 21 matching lines @@
     // Max number of entries we'll keep around.
     kMaxEntries = 25,
   };
 
   // Creates a new TabRestoreServiceHelper and provides an object that provides
   // the current time. The TabRestoreServiceHelper does not take ownership of
   // |time_factory| and |observer|. Note that |observer| can also be NULL.
   TabRestoreServiceHelper(TabRestoreService* tab_restore_service,
                           Observer* observer,
                           Profile* profile,
+                          sessions::TabRestoreServiceClient* client,
                           TimeFactory* time_factory);
 
   ~TabRestoreServiceHelper();
 
   // Helper methods used to implement TabRestoreService.
   void AddObserver(TabRestoreServiceObserver* observer);
   void RemoveObserver(TabRestoreServiceObserver* observer);
   void CreateHistoricalTab(content::WebContents* contents, int index);
   void BrowserClosing(TabRestoreServiceDelegate* delegate);
   void BrowserClosed(TabRestoreServiceDelegate* delegate);
@@ skipping 61 matching lines @@
 
   // Returns true if |tab| has more than one navigation. If |tab| has more
   // than one navigation |tab->current_navigation_index| is constrained based
   // on the number of navigations.
   static bool ValidateTab(Tab* tab);
 
   // Validates all the tabs in a window, plus the window's active tab index.
   static bool ValidateWindow(Window* window);
 
   // Returns true if |tab| is one we care about restoring.
-  static bool IsTabInteresting(const Tab* tab);
+  bool IsTabInteresting(const Tab* tab);
 
   // Checks whether |window| is interesting --- if it only contains a single,
   // uninteresting tab, it's not interesting.
-  static bool IsWindowInteresting(const Window* window);
+  bool IsWindowInteresting(const Window* window);
 
   // Validates and checks |entry| for interesting.
-  static bool FilterEntry(Entry* entry);
+  bool FilterEntry(Entry* entry);
 
   // Finds tab entries with the old browser_id and sets it to the new one.
   void UpdateTabBrowserIDs(SessionID::id_type old_id,
                            SessionID::id_type new_id);
 
   // Gets the current time. This uses the time_factory_ if there is one.
   base::Time TimeNow() const;
 
   TabRestoreService* const tab_restore_service_;
 
   Observer* const observer_;
 
   Profile* const profile_;
 
+  sessions::TabRestoreServiceClient* client_;
+
   // Set of entries. They are ordered from most to least recent.
   Entries entries_;
 
   // Are we restoring a tab? If this is true we ignore requests to create a
   // historical tab.
   bool restoring_;
 
   base::ObserverList<TabRestoreServiceObserver> observer_list_;
 
   // Set of delegates that we've received a BrowserClosing method for but no
   // corresponding BrowserClosed. We cache the set of delegates closing to
   // avoid creating historical tabs for them.
   std::set<TabRestoreServiceDelegate*> closing_delegates_;
 
   TimeFactory* const time_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TabRestoreServiceHelper);
 };
 
 #endif  // CHROME_BROWSER_SESSIONS_TAB_RESTORE_SERVICE_HELPER_H_