Convert SessionService to use new CancelableTaskTracker

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/time.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/browser/sessions/base_session_service.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_list_observer.h"
+#include "chrome/common/cancelable_task_tracker.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/base/ui_base_types.h"
 
 class Profile;
 class SessionCommand;
 class TabContents;
 struct SessionTab;
 struct SessionWindow;
 
@@ skipping 142 matching lines @@
                                   int index);
 
   // Sets the index of the selected tab in the specified window.
   void SetSelectedTabInWindow(const SessionID& window_id, int index);
 
   // Sets the user agent override of the specified tab.
   void SetTabUserAgentOverride(const SessionID& window_id,
                                const SessionID& tab_id,
                                const std::string& user_agent_override);
 
-  // Callback from GetSavedSession of GetLastSession.
-  //
-  // The contents of the supplied vector are deleted after the callback is
-  // notified. To take ownership of the vector clear it before returning.
-  //
-  // The session ID is the id of the window that was last active.
-  typedef base::Callback<void(Handle,
-                              std::vector<SessionWindow*>*,
-                              SessionID::id_type)> SessionCallback;
+  // Callback from GetLastSession.
+  // The second parameter is the id of the window that was last active.
+  typedef base::Callback<void(ScopedVector<SessionWindow>, SessionID::id_type)>
+      SessionCallback;
 
   // 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.
-  //
-  // The created request does NOT directly invoke the callback, rather the
-  // callback invokes OnGotSessionCommands from which we map the
-  // SessionCommands to browser state, then notify the callback.
-  Handle GetLastSession(CancelableRequestConsumerBase* consumer,
-                        const SessionCallback& callback);
+  CancelableTaskTracker::TaskId GetLastSession(const SessionCallback& callback,
+                                               CancelableTaskTracker* tracker);
 
   // Overridden from BaseSessionService because we want some UMA reporting on
   // session update activities.
   virtual void Save() OVERRIDE;
 
  private:
   // Allow tests to access our innards for testing purposes.
   FRIEND_TEST_ALL_PREFIXES(SessionServiceTest, RestoreActivation1);
   FRIEND_TEST_ALL_PREFIXES(SessionServiceTest, RestoreActivation2);
 
@@ skipping 60 matching lines @@
 
   SessionCommand* CreatePinnedStateCommand(const SessionID& tab_id,
                                            bool is_pinned);
 
   SessionCommand* CreateSessionStorageAssociatedCommand(
       const SessionID& tab_id,
       const std::string& session_storage_persistent_id);
 
   SessionCommand* CreateSetActiveWindowCommand(const SessionID& window_id);
 
-  // Callback from the backend for getting the commands from the save file.
-  // Converts the commands in SessionWindows and notifies the real callback.
-  void OnGotSessionCommands(
-      Handle handle,
-      scoped_refptr<InternalGetCommandsRequest> request);
+  // Converts |commands| to SessionWindows and notifies the callback.
+  void OnGotSessionCommands(const SessionCallback& callback,
+                            ScopedVector<SessionCommand> commands);

[marja, 2012/12/06 08:21:58]

(Here too)

 
   // Converts the commands into SessionWindows. On return any valid
   // windows are added to valid_windows. It is up to the caller to delete
   // the windows added to valid_windows. |active_window_id| will be set with the
   // id of the last active window, but it's only valid when this id corresponds
   // to the id of one of the windows in valid_windows.
   void RestoreSessionFromCommands(const std::vector<SessionCommand*>& commands,
                                   std::vector<SessionWindow*>* valid_windows,
                                   SessionID::id_type* active_window_id);
 
@@ skipping 202 matching lines @@
   const base::TimeDelta save_delay_in_hrs_;
 
   // For browser_tests, since we want to simulate the browser shutting down
   // without quitting.
   bool force_browser_not_alive_with_no_windows_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionService);
 };
 
 #endif  // CHROME_BROWSER_SESSIONS_SESSION_SERVICE_H_