[sessions] Properly namespace recently-componentized TabRestore code

chrome/browser/jumplist_win.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.
 
 #ifndef CHROME_BROWSER_JUMPLIST_WIN_H_
 #define CHROME_BROWSER_JUMPLIST_WIN_H_
 
 #include <list>
 #include <string>
 #include <utility>
@@ skipping 31 matching lines @@
 //
 // This class observes the tabs and policies of the given Profile and updates
 // the JumpList whenever a change is detected.
 //
 // Updating a JumpList requires some file operations and it is not good to
 // update it in a UI thread. To solve this problem, this class posts to a
 // runnable method when it actually updates a JumpList.
 //
 // Note. base::CancelableTaskTracker is not thread safe, so we
 // always delete JumpList on UI thread (the same thread it got constructed on).
-class JumpList : public TabRestoreServiceObserver,
+class JumpList : public sessions::TabRestoreServiceObserver,
                  public content::NotificationObserver,
                  public history::TopSitesObserver,
                  public base::RefCountedThreadSafe<
                      JumpList,
                      content::BrowserThread::DeleteOnUIThread> {
  public:
   explicit JumpList(Profile* profile);
 
   // NotificationObserver implementation.
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
   // Observer callback for TabRestoreService::Observer to notify when a tab is
   // added or removed.
-  void TabRestoreServiceChanged(TabRestoreService* service) override;
+  void TabRestoreServiceChanged(sessions::TabRestoreService* service) override;
 
   // Observer callback to notice when our associated TabRestoreService
   // is destroyed.
-  void TabRestoreServiceDestroyed(TabRestoreService* service) override;
+  void TabRestoreServiceDestroyed(
+      sessions::TabRestoreService* service) override;
 
   // Cancel a pending jumplist update.
   void CancelPendingUpdate();
 
   // Terminate the jumplist: cancel any pending updates and stop observing
   // the Profile and its services. This must be called before the |profile_|
   // is destroyed.
   void Terminate();
 
   // Returns true if the custom JumpList is enabled.
   // The custom jumplist works only on Windows 7 and above.
   static bool Enabled();
 
  private:
   friend struct content::BrowserThread::DeleteOnThread<
       content::BrowserThread::UI>;
   friend class base::DeleteHelper<JumpList>;
   ~JumpList() override;
 
   // Creates a ShellLinkItem object from a tab (or a window) and add it to the
   // given list.
   // These functions are copied from the RecentlyClosedTabsHandler class for
   // compatibility with the new-tab page.
-  bool AddTab(const TabRestoreService::Tab* tab,
+  bool AddTab(const sessions::TabRestoreService::Tab* tab,
               ShellLinkItemList* list,
               size_t max_items);
-  void AddWindow(const TabRestoreService::Window* window,
+  void AddWindow(const sessions::TabRestoreService::Window* window,
                  ShellLinkItemList* list,
                  size_t max_items);
 
   // Starts loading a favicon for each URL in |icon_urls_|.
   // This function sends a query to HistoryService.
   // When finishing loading all favicons, this function posts a task that
   // decompresses collected favicons and updates a JumpList.
   void StartLoadingFavicon();
 
   // A callback function for HistoryService that notify when a requested favicon
@@ skipping 74 matching lines @@
   // as they may be used by up to 3 threads.
   base::Lock list_lock_;
 
   // For callbacks may be run after destruction.
   base::WeakPtrFactory<JumpList> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(JumpList);
 };
 
 #endif  // CHROME_BROWSER_JUMPLIST_WIN_H_