Convert SessionService to use new CancelableTaskTracker

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/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;
 
 // 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
@@ skipping 14 matching lines @@
   // ignored and instead the path comes from the profile.
   BaseSessionService(SessionType type,
                      Profile* profile,
                      const FilePath& path);
 
   Profile* profile() const { return profile_; }
 
   // Deletes the last session.
   void DeleteLastSession();
 
-  class InternalGetCommandsRequest;
-
-  typedef base::Callback<void(Handle,
-                              scoped_refptr<InternalGetCommandsRequest>)>
+  typedef base::Callback<void(ScopedVector<SessionCommand>)>
       InternalGetCommandsCallback;
 
-  // Callback used when fetching the last session. The last session consists
-  // of a vector of SessionCommands.
-  class InternalGetCommandsRequest :
-      public CancelableRequest<InternalGetCommandsCallback> {
-   public:
-    explicit InternalGetCommandsRequest(const CallbackType& callback);
-
-    // The commands. The backend fills this in for us.
-    std::vector<SessionCommand*> commands;
-
-   protected:
-    virtual ~InternalGetCommandsRequest();
-
-   private:
-    DISALLOW_COPY_AND_ASSIGN(InternalGetCommandsRequest);
-  };
-
  protected:
   virtual ~BaseSessionService();
 
   // Returns the backend.
   SessionBackend* backend() const { return backend_; }
 
   // Returns the set of commands that needed to be scheduled. The commands
   // in the vector are owned by BaseSessionService, until they are scheduled
   // on the backend at which point the backend owns the commands.
   std::vector<SessionCommand*>&  pending_commands() {
@@ skipping 69 matching lines @@
   // 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);
 
   // Returns true if the entry at specified |url| should be written to disk.
   bool ShouldTrackEntry(const GURL& url);
 
-  // Invokes ReadLastSessionCommands with request on the backend thread.
-  // If testing, ReadLastSessionCommands is invoked directly.
-  Handle ScheduleGetLastSessionCommands(
-      InternalGetCommandsRequest* request,
-      CancelableRequestConsumerBase* consumer);
+  // Invokes SessionBackend::ReadLastSessionCommands with callback on the
+  // backend thread.
+  // If testing, SessionBackend::ReadLastSessionCommands is invoked directly.
+  CancelableTaskTracker::TaskId ScheduleGetLastSessionCommands(
+      const InternalGetCommandsCallback& callback,
+      CancelableTaskTracker* tracker);
 
   // In production, this posts the task to the FILE thread.  For
   // tests, it immediately runs the specified task on the current
   // thread.
   bool RunTaskOnBackendThread(const tracked_objects::Location& from_here,
                               const base::Closure& task);
 
   // Returns true if we appear to be running in production, false if we appear
   // to be running as part of a unit test or if the FILE thread has gone away.
   bool RunningInProduction() const;
@@ skipping 18 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_