Eliminate BaseSessionServiceDelegateImpl

chrome/browser/sessions/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_SESSION_SERVICE_H_
 #define CHROME_BROWSER_SESSIONS_SESSION_SERVICE_H_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/time/time.h"
 #include "chrome/browser/defaults.h"
-#include "chrome/browser/sessions/base_session_service_delegate_impl.h"
+#include "chrome/browser/sessions/session_common_utils.h"
 #include "chrome/browser/sessions/session_service_utils.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list_observer.h"
 #include "components/keyed_service/core/keyed_service.h"
+#include "components/sessions/base_session_service_delegate.h"
 #include "components/sessions/core/tab_restore_service_client.h"
 #include "components/sessions/session_service_commands.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/base/ui_base_types.h"
 
 class Profile;
 
 namespace content {
 class NavigationEntry;
@@ skipping 19 matching lines @@
 // the last session and the current session reset. This is done to provide the
 // illusion that app windows run in separate processes. Similar behavior occurs
 // with incognito windows.
 //
 // SessionService itself uses functions from session_service_commands to store
 // commands which can rebuild the open state of the browser (as |SessionWindow|,
 // |SessionTab| and |SerializedNavigationEntry|). The commands are periodically
 // flushed to |SessionBackend| and written to a file. Every so often
 // |SessionService| rebuilds the contents of the file from the open state of the
 // browser.
-class SessionService : public BaseSessionServiceDelegateImpl,
+class SessionService : public sessions::BaseSessionServiceDelegate,
                        public KeyedService,
                        public content::NotificationObserver,
                        public chrome::BrowserListObserver {
   friend class SessionServiceTestHelper;
  public:
   // Used to distinguish an application from a ordinary content window.
   enum AppType {
     TYPE_APP,
     TYPE_NORMAL
   };
@@ skipping 133 matching lines @@
                          const SessionID& tab_id,
                          base::TimeTicks last_active_time);
 
   // Fetches the contents of the last session, notifying the callback when
   // done. If the callback is supplied an empty vector of SessionWindows
   // it means the session could not be restored.
   base::CancelableTaskTracker::TaskId GetLastSession(
       const sessions::GetLastSessionCallback& callback,
       base::CancelableTaskTracker* tracker);
 
-  // BaseSessionServiceDelegateImpl:
+  // sessions::BaseSessionServiceDelegate:
+  base::SequencedWorkerPool* GetBlockingPool() override;
+  bool ShouldUseDelayedSave() override;
   void OnSavedCommands() override;
 
  private:
   // Allow tests to access our innards for testing purposes.
   FRIEND_TEST_ALL_PREFIXES(SessionServiceTest, SavedSessionNotification);
   FRIEND_TEST_ALL_PREFIXES(SessionServiceTest, RestoreActivation1);
   FRIEND_TEST_ALL_PREFIXES(SessionServiceTest, RestoreActivation2);
   FRIEND_TEST_ALL_PREFIXES(SessionServiceTest, RemoveUnusedRestoreWindowsTest);
   FRIEND_TEST_ALL_PREFIXES(NoStartupWindowTest, DontInitSessionServiceForApps);
 
@@ skipping 100 matching lines @@
 
   // Deletes session data if no windows are open for the current profile.
   void MaybeDeleteSessionOnlyData();
 
   // Unit test accessors.
   sessions::BaseSessionService* GetBaseSessionServiceForTest();
 
   // The profile. This may be null during testing.
   Profile* profile_;
 
+  // Whether to use delayed save. Set to false when constructed with a FilePath
+  // (which should only be used for testing).
+  bool should_use_delayed_save_;
+
   // The owned BaseSessionService.
   scoped_ptr<sessions::BaseSessionService> base_session_service_;
 
   content::NotificationRegistrar registrar_;
 
   // Maps from session tab id to the range of navigation entries that has
   // been written to disk.
   //
   // This is only used if not all the navigation entries have been
   // written.
@@ skipping 44 matching lines @@
   // For browser_tests, since we want to simulate the browser shutting down
   // without quitting.
   bool force_browser_not_alive_with_no_windows_;
 
   base::WeakPtrFactory<SessionService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionService);
 };
 
 #endif  // CHROME_BROWSER_SESSIONS_SESSION_SERVICE_H_