Moves TabNavigation into components/sessions and renames

chrome/browser/sessions/base_session_service.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_SESSIONS_BASE_SESSION_SERVICE_H_
 #define CHROME_BROWSER_SESSIONS_BASE_SESSION_SERVICE_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/common/cancelable_request.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/common/cancelable_task_tracker.h"
 #include "googleurl/src/gurl.h"
 
 class Profile;
 class SessionBackend;
 class SessionCommand;
-class TabNavigation;
+
+namespace components {
+class SerializedNavigationEntry;
+}
 
 // BaseSessionService is the super class of both tab restore service and
 // session service. It contains commonality needed by both, in particular
 // it manages a set of SessionCommands that are periodically sent to a
 // SessionBackend.
 class BaseSessionService : public CancelableRequestProvider {
  public:
   // Identifies the type of session service this is. This is used by the
   // backend to determine the name of the files.
   enum SessionType {
@@ skipping 47 matching lines @@
   void StartSaveTimer();
 
   // Saves pending commands to the backend. This is invoked from the timer
   // scheduled by StartSaveTimer.
   virtual void Save();
 
   // Creates a SessionCommand that represents a navigation.
   SessionCommand* CreateUpdateTabNavigationCommand(
       SessionID::id_type command_id,
       SessionID::id_type tab_id,
-      const TabNavigation& navigation);
+      const components::SerializedNavigationEntry& navigation);
 
   // Creates a SessionCommand that represents marking a tab as an application.
   SessionCommand* CreateSetTabExtensionAppIDCommand(
       SessionID::id_type command_id,
       SessionID::id_type tab_id,
       const std::string& extension_id);
 
   // Creates a SessionCommand that containing user agent override used by a
   // tab's navigations.
   SessionCommand* CreateSetTabUserAgentOverrideCommand(
       SessionID::id_type command_id,
       SessionID::id_type tab_id,
       const std::string& user_agent_override);
 
   // Creates a SessionCommand stores a browser window's app name.
   SessionCommand* CreateSetWindowAppNameCommand(
       SessionID::id_type command_id,
       SessionID::id_type window_id,
       const std::string& app_name);
 
   // Converts a SessionCommand previously created by
-  // CreateUpdateTabNavigationCommand into a TabNavigation. Returns true
-  // on success. If successful |tab_id| is set to the id of the restored tab.
-  bool RestoreUpdateTabNavigationCommand(const SessionCommand& command,
-                                         TabNavigation* navigation,
-                                         SessionID::id_type* tab_id);
+  // CreateUpdateTabNavigationCommand into a
+  // components::SerializedNavigationEntry. Returns true on success. If
+  // successful |tab_id| is set to the id of the restored tab.
+  bool RestoreUpdateTabNavigationCommand(
+      const SessionCommand& command,
+      components::SerializedNavigationEntry* navigation,
+      SessionID::id_type* tab_id);
 
   // Extracts a SessionCommand as previously created by
   // CreateSetTabExtensionAppIDCommand into the tab id and application
   // extension id.
   bool RestoreSetTabExtensionAppIDCommand(
       const SessionCommand& command,
       SessionID::id_type* tab_id,
       std::string* extension_app_id);
 
   // Extracts a SessionCommand as previously created by
@@ skipping 52 matching lines @@
   // over the commands.
   bool pending_reset_;
 
   // The number of commands sent to the backend before doing a reset.
   int commands_since_reset_;
 
   DISALLOW_COPY_AND_ASSIGN(BaseSessionService);
 };
 
 #endif  // CHROME_BROWSER_SESSIONS_BASE_SESSION_SERVICE_H_