base::Bind: Convert more of chrome/browser/sessions.

chrome/browser/sessions/base_session_service.h

 // Copyright (c) 2011 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_
 #pragma once
 
 #include "base/basictypes.h"
-#include "base/callback_old.h"
+#include "base/callback.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "content/browser/cancelable_request.h"
 #include "googleurl/src/gurl.h"
 
 class NavigationEntry;
 class Profile;
 class SessionBackend;
 class SessionCommand;
 class TabNavigation;
@@ skipping 25 matching lines @@
                      Profile* profile,
                      const FilePath& path);
 
   Profile* profile() const { return profile_; }
 
   // Deletes the last session.
   void DeleteLastSession();
 
   class InternalGetCommandsRequest;
 
-  typedef Callback2<Handle, scoped_refptr<InternalGetCommandsRequest> >::Type
+  typedef base::Callback<void(Handle,
+                              scoped_refptr<InternalGetCommandsRequest>)>
       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(CallbackType* callback)
+    explicit InternalGetCommandsRequest(const CallbackType& callback)
         : CancelableRequest<InternalGetCommandsCallback>(callback) {
     }
 
     // The commands. The backend fills this in for us.
     std::vector<SessionCommand*> commands;
 
    protected:
     virtual ~InternalGetCommandsRequest();
 
    private:
@@ skipping 88 matching lines @@
   // Path to read from. This is only used if profile_ is NULL.
   const FilePath& path_;
 
   // The backend.
   scoped_refptr<SessionBackend> backend_;
 
   // Thread backend tasks are run on, is NULL during testing.
   base::Thread* backend_thread_;
 
   // Used to invoke Save.
-  ScopedRunnableMethodFactory<BaseSessionService> save_factory_;
+  base::WeakPtrFactory<BaseSessionService> weak_factory_;
 
   // Commands we need to send over to the backend.
   std::vector<SessionCommand*>  pending_commands_;
 
   // Whether the backend file should be recreated the next time we send
   // 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_