Revert 149576 - gdata: Make WeakPtrFactory the last parameter

chrome/browser/chromeos/gdata/gdata_cache.cc

 // 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.
 
 #include "chrome/browser/chromeos/gdata/gdata_cache.h"
 
 #include <vector>
 
 #include "base/chromeos/chromeos_version.h"
 #include "base/file_util.h"
@@ skipping 306 matching lines @@
     callback.Run(*success, *cache_entry);
 }
 
 }  // namespace
 
 GDataCache::GDataCache(const FilePath& cache_root_path,
                        base::SequencedTaskRunner* blocking_task_runner)
     : cache_root_path_(cache_root_path),
       cache_paths_(GetCachePaths(cache_root_path_)),
       blocking_task_runner_(blocking_task_runner),
-      weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+      ui_weak_ptr_factory_(this),
+      ui_weak_ptr_(ui_weak_ptr_factory_.GetWeakPtr()) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 GDataCache::~GDataCache() {
   AssertOnSequencedWorkerPool();
 }
 
 FilePath GDataCache::GetCacheDirectoryPath(
     CacheSubDirectoryType sub_dir_type) const {
   DCHECK_LE(0, sub_dir_type);
@@ skipping 196 matching lines @@
       new GDataFileError(GDATA_FILE_OK);
   blocking_task_runner_->PostTaskAndReply(
       FROM_HERE,
       base::Bind(&GDataCache::Pin,
                  base::Unretained(this),
                  resource_id,
                  md5,
                  GDataCache::FILE_OPERATION_MOVE,
                  error),
       base::Bind(&GDataCache::OnPinned,
-                 weak_ptr_factory_.GetWeakPtr(),
+                 ui_weak_ptr_,
                  base::Owned(error),
                  resource_id,
                  md5,
                  callback));
 }
 
 void GDataCache::UnpinOnUIThread(const std::string& resource_id,
                                  const std::string& md5,
                                  const CacheOperationCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   GDataFileError* error =
       new GDataFileError(GDATA_FILE_OK);
   blocking_task_runner_->PostTaskAndReply(
       FROM_HERE,
       base::Bind(&GDataCache::Unpin,
                  base::Unretained(this),
                  resource_id,
                  md5,
                  GDataCache::FILE_OPERATION_MOVE,
                  error),
       base::Bind(&GDataCache::OnUnpinned,
-                 weak_ptr_factory_.GetWeakPtr(),
+                 ui_weak_ptr_,
                  base::Owned(error),
                  resource_id,
                  md5,
                  callback));
 }
 
 void GDataCache::SetMountedStateOnUIThread(
     const FilePath& file_path,
     bool to_mount,
     const SetMountedStateCallback& callback) {
@@ skipping 49 matching lines @@
   GDataFileError* error = new GDataFileError(GDATA_FILE_OK);
   blocking_task_runner_->PostTaskAndReply(
       FROM_HERE,
       base::Bind(&GDataCache::CommitDirty,
                  base::Unretained(this),
                  resource_id,
                  md5,
                  GDataCache::FILE_OPERATION_MOVE,
                  error),
       base::Bind(&GDataCache::OnCommitDirty,
-                 weak_ptr_factory_.GetWeakPtr(),
+                 ui_weak_ptr_,
                  base::Owned(error),
                  resource_id,
                  md5,
                  callback));
 }
 
 void GDataCache::ClearDirtyOnUIThread(const std::string& resource_id,
                                       const std::string& md5,
                                       const CacheOperationCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 64 matching lines @@
     const FilePath& cache_root_path,
     base::SequencedTaskRunner* blocking_task_runner) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return new GDataCache(cache_root_path, blocking_task_runner);
 }
 
 void GDataCache::DestroyOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Invalidate the weak pointer.
-  weak_ptr_factory_.InvalidateWeakPtrs();
+  ui_weak_ptr_factory_.InvalidateWeakPtrs();
 
   // Destroy myself on the blocking pool.
   blocking_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&GDataCache::Destroy,
                  base::Unretained(this)));
 }
 
 void GDataCache::Initialize() {
   AssertOnSequencedWorkerPool();
@@ skipping 815 matching lines @@
     const GDataCacheEntry& cache_entry) {
   return cache_entry.is_persistent() ? CACHE_TYPE_PERSISTENT : CACHE_TYPE_TMP;
 }
 
 void SetFreeDiskSpaceGetterForTesting(FreeDiskSpaceGetterInterface* getter) {
   delete global_free_disk_getter_for_testing;  // Safe to delete NULL;
   global_free_disk_getter_for_testing = getter;
 }
 
 }  // namespace gdata