Factor out ContentViewAndroidDelegate

device/power_save_blocker/power_save_blocker_android.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 "device/power_save_blocker/power_save_blocker.h"
 
 #include "base/android/jni_android.h"
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 16 matching lines @@
   void RemoveBlock();
 
  private:
   friend class base::RefCountedThreadSafe<Delegate>;
   ~Delegate();
 
   base::WeakPtr<ui::ViewAndroid> view_android_;
 
   base::android::ScopedJavaGlobalRef<jobject> java_power_save_blocker_;
 
+  std::unique_ptr<ui::ViewAndroid::ScopedAnchorView> anchor_view_;
+
   scoped_refptr<base::SequencedTaskRunner> ui_task_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(Delegate);
 };
 
 PowerSaveBlocker::Delegate::Delegate(
     base::WeakPtr<ui::ViewAndroid> view_android,
     scoped_refptr<base::SequencedTaskRunner> ui_task_runner)
     : view_android_(view_android), ui_task_runner_(ui_task_runner) {
   JNIEnv* env = AttachCurrentThread();
   java_power_save_blocker_.Reset(Java_PowerSaveBlocker_create(env));
 }
 
 PowerSaveBlocker::Delegate::~Delegate() {}
 
 void PowerSaveBlocker::Delegate::ApplyBlock() {
   DCHECK(ui_task_runner_->RunsTasksOnCurrentThread());
 
   ScopedJavaLocalRef<jobject> obj(java_power_save_blocker_);
-  JNIEnv* env = AttachCurrentThread();
   if (view_android_) {
-    Java_PowerSaveBlocker_applyBlock(
-        env, obj.obj(), view_android_->GetViewAndroidDelegate().obj());
+    anchor_view_.reset(view_android_->AcquireAnchorView());
+    JNIEnv* env = AttachCurrentThread();

[no sievers, 2016/07/18 22:14:16]

I think you should handle |anchor_view_.view_.is_null()| here and not call
applyBlock(). (The Java function will access it.)

[Jinsuk Kim, 2016/07/19 07:08:39]

Done.

+    Java_PowerSaveBlocker_applyBlock(env, obj.obj(), anchor_view_->obj());
   }
 }
 
 void PowerSaveBlocker::Delegate::RemoveBlock() {
   DCHECK(ui_task_runner_->RunsTasksOnCurrentThread());
   ScopedJavaLocalRef<jobject> obj(java_power_save_blocker_);
-  JNIEnv* env = AttachCurrentThread();
-  if (view_android_) {
-    Java_PowerSaveBlocker_removeBlock(
-        env, obj.obj(), view_android_->GetViewAndroidDelegate().obj());
-  }
+  Java_PowerSaveBlocker_removeBlock(AttachCurrentThread(), obj.obj());

[no sievers, 2016/07/18 22:14:16]

It's possible that you fixed a corner case bug here where the screen stayed on
by being able to remove the if-check.

[Jinsuk Kim, 2016/07/19 07:08:39]

:)

+  anchor_view_.reset();
 }
 
 PowerSaveBlocker::PowerSaveBlocker(
     PowerSaveBlockerType type,
     Reason reason,
     const std::string& description,
     scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> blocking_task_runner)
     : ui_task_runner_(ui_task_runner),
       blocking_task_runner_(blocking_task_runner) {
@@ skipping 15 matching lines @@
 
   delegate_ = new Delegate(view_android, ui_task_runner_);
   delegate_->ApplyBlock();
 }
 
 bool RegisterPowerSaveBlocker(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace device