base::Bind: Final cleanups in webkit/quota.

webkit/quota/mock_storage_client.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 WEBKIT_QUOTA_MOCK_STORAGE_CLIENT_H_
 #define WEBKIT_QUOTA_MOCK_STORAGE_CLIENT_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 
 #include "base/compiler_specific.h"
+#include "base/memory/weak_ptr.h"
 #include "base/task.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/quota/quota_client.h"
 
 namespace quota {
 
 class QuotaManagerProxy;
 
 struct MockOriginData {
@@ skipping 50 matching lines @@
   scoped_refptr<QuotaManagerProxy> quota_manager_proxy_;
   const ID id_;
 
   typedef std::map<std::pair<GURL, StorageType>, int64> OriginDataMap;
   OriginDataMap origin_data_;
   typedef std::set<std::pair<GURL, StorageType> > ErrorOriginSet;
   ErrorOriginSet error_origins_;
 
   int mock_time_counter_;
 
-  ScopedRunnableMethodFactory<MockStorageClient> runnable_factory_;
+  base::WeakPtrFactory<MockStorageClient> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MockStorageClient);
 };
 
 }  // namespace quota
 
 #endif  // WEBKIT_QUOTA_MOCK_STORAGE_CLIENT_H_