Revert 149576 - gdata: Make WeakPtrFactory the last parameter

chrome/browser/chromeos/gdata/gdata_auth_service.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_auth_service.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/message_loop_proxy.h"
@@ skipping 23 matching lines @@
   registrar_.Add(this,
                  chrome::NOTIFICATION_TOKEN_REQUEST_FAILED,
                  content::Source<TokenService>(service));
 
   if (!refresh_token_.empty())
     FOR_EACH_OBSERVER(Observer, observers_, OnOAuth2RefreshTokenChanged());
 }
 
 GDataAuthService::GDataAuthService()
     : profile_(NULL),
-      weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+      weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+      weak_ptr_bound_to_ui_thread_(weak_ptr_factory_.GetWeakPtr()) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 GDataAuthService::~GDataAuthService() {
 }
 
 void GDataAuthService::StartAuthentication(
     GDataOperationRegistry* registry,
     const AuthStatusCallback& callback) {
   scoped_refptr<base::MessageLoopProxy> relay_proxy(
       base::MessageLoopProxy::current());
 
   if (HasAccessToken()) {
     relay_proxy->PostTask(FROM_HERE,
          base::Bind(callback, gdata::HTTP_SUCCESS, access_token_));
   } else if (HasRefreshToken()) {
     BrowserThread::PostTask(
         BrowserThread::UI,
         FROM_HERE,
         base::Bind(&GDataAuthService::StartAuthenticationOnUIThread,
-                   weak_ptr_factory_.GetWeakPtr(),
+                   weak_ptr_bound_to_ui_thread_,
                    registry,
                    relay_proxy,
                    base::Bind(&GDataAuthService::OnAuthCompleted,
-                              weak_ptr_factory_.GetWeakPtr(),
+                              weak_ptr_bound_to_ui_thread_,
                               relay_proxy,
                               callback)));
   } else {
     relay_proxy->PostTask(FROM_HERE,
         base::Bind(callback, gdata::HTTP_UNAUTHORIZED, std::string()));
   }
 }
 
 void GDataAuthService::StartAuthenticationOnUIThread(
     GDataOperationRegistry* registry,
@@ skipping 43 matching lines @@
   if (type == chrome::NOTIFICATION_TOKEN_AVAILABLE) {
     TokenService* service = TokenServiceFactory::GetForProfile(profile_);
     refresh_token_ = service->GetOAuth2LoginRefreshToken();
   } else {
     refresh_token_.clear();
   }
   FOR_EACH_OBSERVER(Observer, observers_, OnOAuth2RefreshTokenChanged());
 }
 
 }  // namespace gdata