Split TabRestoreService into InMemoryTRS and PersistentTRS

chrome/browser/sessions/persistent_tab_restore_service.h

Index: chrome/browser/sessions/persistent_tab_restore_service.h
diff --git a/chrome/browser/sessions/persistent_tab_restore_service.h b/chrome/browser/sessions/persistent_tab_restore_service.h
new file mode 100644
index 0000000000000000000000000000000000000000..fb52cf41c30c7ff400874f8952a551f33d3064e6
--- /dev/null
+++ b/chrome/browser/sessions/persistent_tab_restore_service.h
@@ -0,0 +1,59 @@
+// 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_PERSISTENT_TAB_RESTORE_SERVICE_H_
+#define CHROME_BROWSER_SESSIONS_PERSISTENT_TAB_RESTORE_SERVICE_H_
+
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
+#include "base/memory/scoped_ptr.h"
+#include "chrome/browser/sessions/tab_restore_service.h"
+#include "chrome/browser/sessions/tab_restore_service_helper.h"
+
+class Profile;
+
+// Tab restore service that persists data on disk.
+class PersistentTabRestoreService : public TabRestoreService {
+ public:
+  PersistentTabRestoreService(Profile* profile,

[sky, 2012/10/25 00:45:44]

Document ownership of time_factory (you did a nice job of this in
InMemoryTabRestoreService).

[Philippe, 2012/10/25 15:37:07]

Done.

+                              TimeFactory* time_factory);
+
+  virtual ~PersistentTabRestoreService();
+
+  // TabRestoreService:
+  virtual void AddObserver(TabRestoreServiceObserver* observer) OVERRIDE;
+  virtual void RemoveObserver(TabRestoreServiceObserver* observer) OVERRIDE;
+  virtual void CreateHistoricalTab(content::WebContents* contents,
+                                   int index) OVERRIDE;
+  virtual void BrowserClosing(TabRestoreServiceDelegate* delegate) OVERRIDE;
+  virtual void BrowserClosed(TabRestoreServiceDelegate* delegate) OVERRIDE;
+  virtual void ClearEntries() OVERRIDE;
+  virtual const Entries& entries() const OVERRIDE;
+  virtual void RestoreMostRecentEntry(
+      TabRestoreServiceDelegate* delegate) OVERRIDE;
+  virtual Tab* RemoveTabEntryById(SessionID::id_type id) OVERRIDE;
+  virtual void RestoreEntryById(TabRestoreServiceDelegate* delegate,
+                                SessionID::id_type id,
+                                WindowOpenDisposition disposition) OVERRIDE;
+  virtual void LoadTabsFromLastSession() OVERRIDE;
+  virtual bool IsLoaded() const OVERRIDE;
+  virtual void DeleteLastSession() OVERRIDE;
+  virtual void Shutdown() OVERRIDE;
+
+ private:
+  friend class TabRestoreServiceTest;
+
+  class Delegate;
+
+  // Exposed for testing.
+  Entries* mutable_entries();
+  void PruneEntries();
+
+  scoped_ptr<Delegate> delegate_;
+  TabRestoreServiceHelper helper_;
+
+  DISALLOW_COPY_AND_ASSIGN(PersistentTabRestoreService);
+};
+
+#endif  // CHROME_BROWSER_SESSIONS_PERSISTENT_TAB_RESTORE_SERVICE_H_