WeakPtr destruction order cleanup: media edition.

content/browser/media/android/media_resource_getter_impl.cc

 // Copyright 2013 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 "content/browser/media/android/media_resource_getter_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/path_service.h"
@@ skipping 182 matching lines @@
     cookie_store->GetCookiesWithOptionsAsync(
         url, net::CookieOptions(), callback);
   } else {
     callback.Run(std::string());
   }
 }
 
 MediaResourceGetterImpl::MediaResourceGetterImpl(
     BrowserContext* browser_context,
     fileapi::FileSystemContext* file_system_context,
-    int renderer_id, int routing_id)
+    int renderer_id,
+    int routing_id)
     : browser_context_(browser_context),
       file_system_context_(file_system_context),
-      weak_this_(this),
       renderer_id_(renderer_id),
-      routing_id_(routing_id) {
-}
+      routing_id_(routing_id),
+      weak_factory_(this) {}
 
 MediaResourceGetterImpl::~MediaResourceGetterImpl() {}
 
 void MediaResourceGetterImpl::GetCookies(
     const GURL& url, const GURL& first_party_for_cookies,
     const GetCookieCB& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   scoped_refptr<CookieGetterTask> task = new CookieGetterTask(
       browser_context_, renderer_id_, routing_id_);
 
   GetCookieCB cb = base::Bind(&MediaResourceGetterImpl::GetCookiesCallback,
-                              weak_this_.GetWeakPtr(), callback);
+                              weak_factory_.GetWeakPtr(),
+                              callback);
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&CookieGetterTask::RequestCookies,
                  task, url, first_party_for_cookies,
                  base::Bind(&ReturnResultOnUIThread, cb)));
 }
 
 void MediaResourceGetterImpl::GetCookiesCallback(
     const GetCookieCB& callback, const std::string& cookies) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   callback.Run(cookies);
 }
 
 void MediaResourceGetterImpl::GetPlatformPathFromURL(
     const GURL& url, const GetPlatformPathCB& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(url.SchemeIsFileSystem() || url.SchemeIs(kBlobScheme));
 
-  GetPlatformPathCB cb = base::Bind(
-      &MediaResourceGetterImpl::GetPlatformPathCallback,
-      weak_this_.GetWeakPtr(), callback);
+  GetPlatformPathCB cb =
+      base::Bind(&MediaResourceGetterImpl::GetPlatformPathCallback,
+                 weak_factory_.GetWeakPtr(),
+                 callback);
 
   if (url.SchemeIs(kBlobScheme)) {
     BrowserThread::PostTask(
         BrowserThread::IO,
         FROM_HERE,
         base::Bind(&RequestPlatformPathFromBlobURL, url, browser_context_, cb));
     return;
   }
 
   scoped_refptr<fileapi::FileSystemContext> context(file_system_context_);
@@ skipping 19 matching lines @@
       FROM_HERE,
       base::Bind(&GetMediaMetadata, url, cookies, user_agent, callback));
 }
 
 // static
 bool MediaResourceGetterImpl::RegisterMediaResourceGetter(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content