[sessions] Properly namespace recently-componentized TabRestore code

chrome/browser/extensions/api/sessions/sessions_api.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_EXTENSIONS_API_SESSIONS_SESSIONS_API_H__
 #define CHROME_BROWSER_EXTENSIONS_API_SESSIONS_SESSIONS_API_H__
 
 #include <string>
 
 #include "chrome/browser/extensions/chrome_extension_function.h"
@@ skipping 16 matching lines @@
 class SessionId;
 
 class SessionsGetRecentlyClosedFunction : public ChromeSyncExtensionFunction {
  protected:
   ~SessionsGetRecentlyClosedFunction() override {}
   bool RunSync() override;
   DECLARE_EXTENSION_FUNCTION("sessions.getRecentlyClosed",
                              SESSIONS_GETRECENTLYCLOSED)
 
  private:
-  scoped_ptr<api::tabs::Tab> CreateTabModel(const TabRestoreService::Tab& tab,
-                                            int session_id,
-                                            int selected_index);
+  scoped_ptr<api::tabs::Tab> CreateTabModel(
+      const sessions::TabRestoreService::Tab& tab,
+      int session_id,
+      int selected_index);
   scoped_ptr<api::windows::Window> CreateWindowModel(
-      const TabRestoreService::Window& window,
+      const sessions::TabRestoreService::Window& window,
       int session_id);
   scoped_ptr<api::sessions::Session> CreateSessionModel(
-      const TabRestoreService::Entry* entry);
+      const sessions::TabRestoreService::Entry* entry);
 };
 
 class SessionsGetDevicesFunction : public ChromeSyncExtensionFunction {
  protected:
   ~SessionsGetDevicesFunction() override {}
   bool RunSync() override;
   DECLARE_EXTENSION_FUNCTION("sessions.getDevices", SESSIONS_GETDEVICES)
 
  private:
   scoped_ptr<api::tabs::Tab> CreateTabModel(const std::string& session_tag,
@@ skipping 19 matching lines @@
  private:
   void SetInvalidIdError(const std::string& invalid_id);
   void SetResultRestoredTab(content::WebContents* contents);
   bool SetResultRestoredWindow(int window_id);
   bool RestoreMostRecentlyClosed(Browser* browser);
   bool RestoreLocalSession(const SessionId& session_id, Browser* browser);
   bool RestoreForeignSession(const SessionId& session_id,
                              Browser* browser);
 };
 
-class SessionsEventRouter : public TabRestoreServiceObserver {
+class SessionsEventRouter : public sessions::TabRestoreServiceObserver {
  public:
   explicit SessionsEventRouter(Profile* profile);
   ~SessionsEventRouter() override;
 
   // Observer callback for TabRestoreServiceObserver. Sends data on
   // recently closed tabs to the javascript side of this page to
   // display to the user.
-  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;
 
  private:
   Profile* profile_;
 
   // TabRestoreService that we are observing.
-  TabRestoreService* tab_restore_service_;
+  sessions::TabRestoreService* tab_restore_service_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionsEventRouter);
 };
 
 class SessionsAPI : public BrowserContextKeyedAPI,
                     public extensions::EventRouter::Observer {
  public:
   explicit SessionsAPI(content::BrowserContext* context);
   ~SessionsAPI() override;
 
@@ skipping 19 matching lines @@
 
   // Created lazily upon OnListenerAdded.
   scoped_ptr<SessionsEventRouter> sessions_event_router_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionsAPI);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_SESSIONS_SESSIONS_API_H__