Refactoring of SessionService to get componentized.

chrome/browser/sessions/base_session_service_commands.h

Index: chrome/browser/sessions/base_session_service_commands.h
diff --git a/chrome/browser/sessions/base_session_service_commands.h b/chrome/browser/sessions/base_session_service_commands.h
new file mode 100644
index 0000000000000000000000000000000000000000..b97b4f217b33705aca91f53bba64b0efa4e87375
--- /dev/null
+++ b/chrome/browser/sessions/base_session_service_commands.h
@@ -0,0 +1,85 @@
+// Copyright 2014 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_COMMANDS_H_
+#define CHROME_BROWSER_SESSIONS_BASE_SESSION_SERVICE_COMMANDS_H_
+
+#include <string>
+
+#include "components/sessions/session_id.h"
+
+class SessionCommand;
+
+namespace sessions {
+class SerializedNavigationEntry;
+}
+
+// BaseSessionServiceCommands is the super class of both tab restore service
+// and session service for command creation and restoration.
+class BaseSessionServiceCommands {

[sky, 2014/10/23 21:51:49]

None of these functions need any state. I think they are better served as
standalone functions.

[Mr4D (OOO till 08-26), 2014/10/27 22:26:35]

Done.

[Mr4D (OOO till 08-26), 2014/10/28 21:45:37]

Addressed also in #6.

+ public:
+  BaseSessionServiceCommands();
+  virtual ~BaseSessionServiceCommands();
+
+  // Creates a SessionCommand that represents a navigation.
+  SessionCommand* CreateUpdateTabNavigationCommand(

[sky, 2014/10/23 21:51:49]

These should all return scoped_ptr to make ownership clear.

[Mr4D (OOO till 08-26), 2014/10/27 22:26:35]

Wow. This was close to a day of work - but it's done.

[Mr4D (OOO till 08-26), 2014/10/28 21:45:38]

Will create separate patch for this.

+      SessionID::id_type command_id,
+      SessionID::id_type tab_id,
+      const sessions::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
+  // sessions::SerializedNavigationEntry. Returns true on success. If
+  // successful |tab_id| is set to the id of the restored tab.
+  bool RestoreUpdateTabNavigationCommand(
+      const SessionCommand& command,
+      sessions::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
+  // CreateSetTabUserAgentOverrideCommand into the tab id and user agent.
+  bool RestoreSetTabUserAgentOverrideCommand(
+      const SessionCommand& command,
+      SessionID::id_type* tab_id,
+      std::string* user_agent_override);
+
+  // Extracts a SessionCommand as previously created by
+  // CreateSetWindowAppNameCommand into the window id and application name.
+  bool RestoreSetWindowAppNameCommand(
+      const SessionCommand& command,
+      SessionID::id_type* window_id,
+      std::string* app_name);
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(BaseSessionServiceCommands);
+};
+
+#endif  // CHROME_BROWSER_SESSIONS_BASE_SESSION_SERVICE_COMMANDS_H_