Power Save Blocker: Eliminate passing ViewAndroid as WeakPtr

content/browser/wake_lock/wake_lock_service_context.cc

 // Copyright 2015 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/wake_lock/wake_lock_service_context.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "build/build_config.h"
@@ skipping 20 matching lines @@
                                             render_process_id, render_frame_id),
       std::move(request));
 }
 
 void WakeLockServiceContext::RenderFrameDeleted(
     RenderFrameHost* render_frame_host) {
   CancelWakeLock(render_frame_host->GetProcess()->GetID(),
                  render_frame_host->GetRoutingID());
 }
 
-void WakeLockServiceContext::WebContentsDestroyed() {
-#if defined(OS_ANDROID)
-  view_weak_factory_.reset();
-#endif
-}
-
 void WakeLockServiceContext::RequestWakeLock(int render_process_id,
                                              int render_frame_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (!RenderFrameHost::FromID(render_process_id, render_frame_id))
     return;
 
   frames_requesting_lock_.insert(
       std::pair<int, int>(render_process_id, render_frame_id));
   UpdateWakeLock();
 }
@@ skipping 16 matching lines @@
       device::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,
       device::PowerSaveBlocker::kReasonOther, "Wake Lock API",
       BrowserThread::GetTaskRunnerForThread(BrowserThread::UI),
       BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE)));
 
 #if defined(OS_ANDROID)
   // On Android, additionaly associate the blocker with this WebContents.
   DCHECK(web_contents());
 
   if (web_contents()->GetNativeView()) {
-    view_weak_factory_.reset(new base::WeakPtrFactory<ui::ViewAndroid>(
-        web_contents()->GetNativeView()));
-    wake_lock_.get()->InitDisplaySleepBlocker(view_weak_factory_->GetWeakPtr());
+    wake_lock_.get()->InitDisplaySleepBlocker(web_contents()->GetNativeView());
   }
 #endif
 }
 
 void WakeLockServiceContext::RemoveWakeLock() {
   DCHECK(wake_lock_);
   wake_lock_.reset();
 }
 
 void WakeLockServiceContext::UpdateWakeLock() {
   if (!frames_requesting_lock_.empty()) {
     if (!wake_lock_)
       CreateWakeLock();
   } else {
     if (wake_lock_)
       RemoveWakeLock();
   }
 }
 
 }  // namespace content