14 files changed, 28 insertions, 23 deletions
diff --git a/webkit/browser/appcache/mock_appcache_storage.cc b/webkit/browser/appcache/mock_appcache_storage.cc
index e893b81..27f0a63 100644
--- a/webkit/browser/appcache/mock_appcache_storage.cc
+++ b/webkit/browser/appcache/mock_appcache_storage.cc
@@ -29,14 +29,14 @@ namespace appcache {
 
 MockAppCacheStorage::MockAppCacheStorage(AppCacheService* service)
     : AppCacheStorage(service),
-      weak_factory_(this),
       simulate_make_group_obsolete_failure_(false),
       simulate_store_group_and_newest_cache_failure_(false),
       simulate_find_main_resource_(false),
       simulate_find_sub_resource_(false),
       simulated_found_cache_id_(kNoCacheId),
       simulated_found_group_id_(0),
-      simulated_found_network_namespace_(false) {
+      simulated_found_network_namespace_(false),
+      weak_factory_(this) {
   last_cache_id_ = 0;
   last_group_id_ = 0;
   last_response_id_ = 0;
diff --git a/webkit/browser/appcache/mock_appcache_storage.h b/webkit/browser/appcache/mock_appcache_storage.h
index 1b7674b..94ae958 100644
--- a/webkit/browser/appcache/mock_appcache_storage.h
+++ b/webkit/browser/appcache/mock_appcache_storage.h
@@ -177,7 +177,6 @@ class MockAppCacheStorage : public AppCacheStorage {
   DoomedResponseIds doomed_response_ids_;
   scoped_ptr<AppCacheDiskCache> disk_cache_;
   std::deque<base::Closure> pending_tasks_;
-  base::WeakPtrFactory<MockAppCacheStorage> weak_factory_;
 
   bool simulate_make_group_obsolete_failure_;
   bool simulate_store_group_and_newest_cache_failure_;
@@ -194,6 +193,8 @@ class MockAppCacheStorage : public AppCacheStorage {
   scoped_refptr<AppCacheInfoCollection> simulated_appcache_info_;
   scoped_ptr<AppCacheResponseReader> simulated_reader_;
 
+  base::WeakPtrFactory<MockAppCacheStorage> weak_factory_;
+
   FRIEND_TEST_ALL_PREFIXES(MockAppCacheStorageTest, BasicFindMainResponse);
   FRIEND_TEST_ALL_PREFIXES(MockAppCacheStorageTest,
                            BasicFindMainFallbackResponse);
diff --git a/webkit/browser/appcache/view_appcache_internals_job.cc b/webkit/browser/appcache/view_appcache_internals_job.cc
index 22bb1e7..0b68e99 100644
--- a/webkit/browser/appcache/view_appcache_internals_job.cc
+++ b/webkit/browser/appcache/view_appcache_internals_job.cc
@@ -381,8 +381,8 @@ class MainPageJob : public BaseInternalsJob {
     StartAsync();
   }
 
-  base::WeakPtrFactory<MainPageJob> weak_factory_;
   scoped_refptr<AppCacheInfoCollection> info_collection_;
+  base::WeakPtrFactory<MainPageJob> weak_factory_;
   DISALLOW_COPY_AND_ASSIGN(MainPageJob);
 };
 
diff --git a/webkit/browser/blob/blob_url_request_job.cc b/webkit/browser/blob/blob_url_request_job.cc
index 8f27ede..4b89636 100644
--- a/webkit/browser/blob/blob_url_request_job.cc
+++ b/webkit/browser/blob/blob_url_request_job.cc
@@ -51,7 +51,6 @@ BlobURLRequestJob::BlobURLRequestJob(
     fileapi::FileSystemContext* file_system_context,
     base::MessageLoopProxy* file_thread_proxy)
     : net::URLRequestJob(request, network_delegate),
-      weak_factory_(this),
       blob_data_(blob_data),
       file_system_context_(file_system_context),
       file_thread_proxy_(file_thread_proxy),
@@ -61,7 +60,8 @@ BlobURLRequestJob::BlobURLRequestJob(
       current_item_index_(0),
       current_item_offset_(0),
       error_(false),
-      byte_range_set_(false) {
+      byte_range_set_(false),
+      weak_factory_(this) {
   DCHECK(file_thread_proxy_.get());
 }
 
diff --git a/webkit/browser/blob/blob_url_request_job.h b/webkit/browser/blob/blob_url_request_job.h
index 5957288..238958f 100644
--- a/webkit/browser/blob/blob_url_request_job.h
+++ b/webkit/browser/blob/blob_url_request_job.h
@@ -97,8 +97,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT BlobURLRequestJob
   // Creates a FileStreamReader for the item at |index| with additional_offset.
   void CreateFileStreamReader(size_t index, int64 additional_offset);
 
-  base::WeakPtrFactory<BlobURLRequestJob> weak_factory_;
-
   scoped_refptr<BlobData> blob_data_;
 
   // Variables for controlling read from |blob_data_|.
@@ -123,6 +121,8 @@ class WEBKIT_STORAGE_BROWSER_EXPORT BlobURLRequestJob
 
   scoped_ptr<net::HttpResponseInfo> response_info_;
 
+  base::WeakPtrFactory<BlobURLRequestJob> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(BlobURLRequestJob);
 };
 
diff --git a/webkit/browser/fileapi/file_system_url_request_job.cc b/webkit/browser/fileapi/file_system_url_request_job.cc
index 7d1f861..57db300 100644
--- a/webkit/browser/fileapi/file_system_url_request_job.cc
+++ b/webkit/browser/fileapi/file_system_url_request_job.cc
@@ -60,9 +60,9 @@ FileSystemURLRequestJob::FileSystemURLRequestJob(
     FileSystemContext* file_system_context)
     : URLRequestJob(request, network_delegate),
       file_system_context_(file_system_context),
-      weak_factory_(this),
       is_directory_(false),
-      remaining_bytes_(0) {
+      remaining_bytes_(0),
+      weak_factory_(this) {
 }
 
 FileSystemURLRequestJob::~FileSystemURLRequestJob() {}
diff --git a/webkit/browser/fileapi/file_system_url_request_job.h b/webkit/browser/fileapi/file_system_url_request_job.h
index 6b829e6..a784d62 100644
--- a/webkit/browser/fileapi/file_system_url_request_job.h
+++ b/webkit/browser/fileapi/file_system_url_request_job.h
@@ -67,13 +67,13 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemURLRequestJob
   void NotifyFailed(int rv);
 
   FileSystemContext* file_system_context_;
-  base::WeakPtrFactory<FileSystemURLRequestJob> weak_factory_;
   scoped_ptr<webkit_blob::FileStreamReader> reader_;
   FileSystemURL url_;
   bool is_directory_;
   scoped_ptr<net::HttpResponseInfo> response_info_;
   int64 remaining_bytes_;
   net::HttpByteRange byte_range_;
+  base::WeakPtrFactory<FileSystemURLRequestJob> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FileSystemURLRequestJob);
 };
diff --git a/webkit/browser/fileapi/file_system_usage_cache.cc b/webkit/browser/fileapi/file_system_usage_cache.cc
index c1896fb..56b1fb4 100644
--- a/webkit/browser/fileapi/file_system_usage_cache.cc
+++ b/webkit/browser/fileapi/file_system_usage_cache.cc
@@ -23,8 +23,8 @@ const size_t kMaxHandleCacheSize = 2;
 
 FileSystemUsageCache::FileSystemUsageCache(
     base::SequencedTaskRunner* task_runner)
-    : weak_factory_(this),
-      task_runner_(task_runner) {
+    : task_runner_(task_runner),
+      weak_factory_(this) {
 }
 
 FileSystemUsageCache::~FileSystemUsageCache() {
diff --git a/webkit/browser/fileapi/file_system_usage_cache.h b/webkit/browser/fileapi/file_system_usage_cache.h
index b4d8464..c3950a5 100644
--- a/webkit/browser/fileapi/file_system_usage_cache.h
+++ b/webkit/browser/fileapi/file_system_usage_cache.h
@@ -93,10 +93,11 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemUsageCache {
 
   scoped_ptr<TimedTaskHelper> timer_;
   std::map<base::FilePath, base::PlatformFile> cache_files_;
-  base::WeakPtrFactory<FileSystemUsageCache> weak_factory_;
 
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
 
+  base::WeakPtrFactory<FileSystemUsageCache> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(FileSystemUsageCache);
 };
 
diff --git a/webkit/browser/quota/mock_quota_manager.h b/webkit/browser/quota/mock_quota_manager.h
index 1d44494..3fb9e15 100644
--- a/webkit/browser/quota/mock_quota_manager.h
+++ b/webkit/browser/quota/mock_quota_manager.h
@@ -131,8 +131,8 @@ class MockQuotaManager : public QuotaManager {
 
   // The list of stored origins that have been added via AddOrigin.
   std::vector<OriginInfo> origins_;
-  base::WeakPtrFactory<MockQuotaManager> weak_factory_;
   UsageAndQuotaMap usage_and_quota_map_;
+  base::WeakPtrFactory<MockQuotaManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MockQuotaManager);
 };
diff --git a/webkit/browser/quota/mock_quota_manager_unittest.cc b/webkit/browser/quota/mock_quota_manager_unittest.cc
index fb3047d..bb4db22 100644
--- a/webkit/browser/quota/mock_quota_manager_unittest.cc
+++ b/webkit/browser/quota/mock_quota_manager_unittest.cc
@@ -34,8 +34,8 @@ const QuotaClient::ID kClientDB = QuotaClient::kIndexedDatabase;
 class MockQuotaManagerTest : public testing::Test {
  public:
   MockQuotaManagerTest()
-    : weak_factory_(this),
-      deletion_callback_count_(0) {
+    : deletion_callback_count_(0),
+      weak_factory_(this) {
   }
 
   virtual void SetUp() {
@@ -98,7 +98,6 @@ class MockQuotaManagerTest : public testing::Test {
  private:
   base::MessageLoop message_loop_;
   base::ScopedTempDir data_dir_;
-  base::WeakPtrFactory<MockQuotaManagerTest> weak_factory_;
   scoped_refptr<MockQuotaManager> manager_;
   scoped_refptr<MockSpecialStoragePolicy> policy_;
 
@@ -107,6 +106,8 @@ class MockQuotaManagerTest : public testing::Test {
   std::set<GURL> origins_;
   StorageType type_;
 
+  base::WeakPtrFactory<MockQuotaManagerTest> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(MockQuotaManagerTest);
 };
 
diff --git a/webkit/browser/quota/quota_manager.cc b/webkit/browser/quota/quota_manager.cc
index 66ec5c0..0f445a0 100644
--- a/webkit/browser/quota/quota_manager.cc
+++ b/webkit/browser/quota/quota_manager.cc
@@ -513,8 +513,8 @@ class QuotaManager::GetUsageInfoTask : public QuotaTask {
 
   GetUsageInfoCallback callback_;
   UsageInfoEntries entries_;
-  base::WeakPtrFactory<GetUsageInfoTask> weak_factory_;
   int remaining_trackers_;
+  base::WeakPtrFactory<GetUsageInfoTask> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GetUsageInfoTask);
 };
diff --git a/webkit/browser/quota/quota_manager.h b/webkit/browser/quota/quota_manager.h
index df8347e..c2a76cb 100644
--- a/webkit/browser/quota/quota_manager.h
+++ b/webkit/browser/quota/quota_manager.h
@@ -416,7 +416,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT QuotaManager
 
   scoped_refptr<SpecialStoragePolicy> special_storage_policy_;
 
-  base::WeakPtrFactory<QuotaManager> weak_factory_;
   base::RepeatingTimer<QuotaManager> histogram_timer_;
 
   // Pointer to the function used to get the available disk space. This is
@@ -424,6 +423,8 @@ class WEBKIT_STORAGE_BROWSER_EXPORT QuotaManager
   // value. The default value points to base::SysInfo::AmountOfFreeDiskSpace.
   GetAvailableDiskSpaceFn get_disk_space_fn_;
 
+  base::WeakPtrFactory<QuotaManager> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(QuotaManager);
 };
 
diff --git a/webkit/browser/quota/quota_manager_unittest.cc b/webkit/browser/quota/quota_manager_unittest.cc
index cb9ffea..b5a8bdc 100644
--- a/webkit/browser/quota/quota_manager_unittest.cc
+++ b/webkit/browser/quota/quota_manager_unittest.cc
@@ -56,8 +56,8 @@ class QuotaManagerTest : public testing::Test {
 
  public:
   QuotaManagerTest()
-      : weak_factory_(this),
-        mock_time_counter_(0) {
+      : mock_time_counter_(0),
+        weak_factory_(this) {
   }
 
   virtual void SetUp() {
@@ -411,7 +411,6 @@ class QuotaManagerTest : public testing::Test {
 
   base::MessageLoop message_loop_;
   base::ScopedTempDir data_dir_;
-  base::WeakPtrFactory<QuotaManagerTest> weak_factory_;
 
   scoped_refptr<QuotaManager> quota_manager_;
   scoped_refptr<MockSpecialStoragePolicy> mock_special_storage_policy_;
@@ -434,6 +433,8 @@ class QuotaManagerTest : public testing::Test {
 
   int mock_time_counter_;
 
+  base::WeakPtrFactory<QuotaManagerTest> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(QuotaManagerTest);
 };