[sessions] Properly namespace recently-componentized TabRestore code

chrome/browser/ui/views/frame/global_menu_bar_x11.h

 // Copyright 2013 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_UI_VIEWS_FRAME_GLOBAL_MENU_BAR_X11_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_GLOBAL_MENU_BAR_X11_H_
 
 #include <map>
 #include <string>
 
@@ skipping 35 matching lines @@
 // Unity has an Apple-like menu bar at the top of the screen that changes
 // depending on the active window. In the GTK port, we had a hidden GtkMenuBar
 // object in each GtkWindow which existed only to be scrapped by the
 // libdbusmenu-gtk code. Since we don't have GtkWindows anymore, we need to
 // interface directly with the lower level libdbusmenu-glib, which we
 // opportunistically dlopen() since not everyone is running Ubuntu.
 class GlobalMenuBarX11 : public AvatarMenuObserver,
                          public chrome::BrowserListObserver,
                          public CommandObserver,
                          public history::TopSitesObserver,
-                         public TabRestoreServiceObserver,
+                         public sessions::TabRestoreServiceObserver,
                          public views::DesktopWindowTreeHostObserverX11 {
  public:
   GlobalMenuBarX11(BrowserView* browser_view,
                    BrowserDesktopWindowTreeHostX11* host);
   ~GlobalMenuBarX11() override;
 
   // Creates the object path for DbusemenuServer which is attached to |xid|.
   static std::string GetPathForWindow(unsigned long xid);
 
  private:
@@ skipping 17 matching lines @@
   // |menu_str_id|. Then appends it to |parent|.
   DbusmenuMenuitem* BuildStaticMenu(DbusmenuMenuitem* parent,
                                     int menu_str_id,
                                     GlobalMenuBarCommand* commands);
 
   // Sets the accelerator for |item|.
   void RegisterAccelerator(DbusmenuMenuitem* item,
                            const ui::Accelerator& accelerator);
 
   // Creates a HistoryItem from the data in |entry|.
-  HistoryItem* HistoryItemForTab(const TabRestoreService::Tab& entry);
+  HistoryItem* HistoryItemForTab(const sessions::TabRestoreService::Tab& entry);
 
   // Creates a menu item form |item| and inserts it in |menu| at |index|.
   void AddHistoryItemToMenu(HistoryItem* item,
                             DbusmenuMenuitem* menu,
                             int tag,
                             int index);
 
   // Sends a message off to History for data.
   void GetTopSitesData();
 
@@ skipping 24 matching lines @@
 
   // Overridden from CommandObserver:
   void EnabledStateChangedForCommand(int id, bool enabled) override;
 
   // Overridden from history::TopSitesObserver:
   void TopSitesLoaded(history::TopSites* top_sites) override;
   void TopSitesChanged(history::TopSites* top_sites,
                        ChangeReason change_reason) override;
 
   // Overridden from TabRestoreServiceObserver:
-  void TabRestoreServiceChanged(TabRestoreService* service) override;
-  void TabRestoreServiceDestroyed(TabRestoreService* service) override;
+  void TabRestoreServiceChanged(sessions::TabRestoreService* service) override;
+  void TabRestoreServiceDestroyed(
+      sessions::TabRestoreService* service) override;
 
   // Overridden from views::DesktopWindowTreeHostObserverX11:
   void OnWindowMapped(unsigned long xid) override;
   void OnWindowUnmapped(unsigned long xid) override;
 
   CHROMEG_CALLBACK_1(GlobalMenuBarX11, void, OnItemActivated, DbusmenuMenuitem*,
                      unsigned int);
   CHROMEG_CALLBACK_1(GlobalMenuBarX11, void, OnHistoryItemActivated,
                      DbusmenuMenuitem*, unsigned int);
   CHROMEG_CALLBACK_0(GlobalMenuBarX11, void, OnHistoryMenuAboutToShow,
@@ skipping 17 matching lines @@
   DbusmenuServer* server_;
   DbusmenuMenuitem* root_item_;
   DbusmenuMenuitem* history_menu_;
   DbusmenuMenuitem* profiles_menu_;
 
   // Tracks value of the kShowBookmarkBar preference.
   PrefChangeRegistrar pref_change_registrar_;
 
   scoped_refptr<history::TopSites> top_sites_;
 
-  TabRestoreService* tab_restore_service_;  // weak
+  sessions::TabRestoreService* tab_restore_service_;  // weak
 
   scoped_ptr<AvatarMenu> avatar_menu_;
 
   ScopedObserver<history::TopSites, history::TopSitesObserver> scoped_observer_;
 
   // For callbacks may be run after destruction.
   base::WeakPtrFactory<GlobalMenuBarX11> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GlobalMenuBarX11);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_GLOBAL_MENU_BAR_X11_H_