Separate SwipeRefreshHandler and ContentViewCore

content/browser/android/overscroll_controller_android.cc

Index: content/browser/android/overscroll_controller_android.cc
diff --git a/content/browser/android/overscroll_controller_android.cc b/content/browser/android/overscroll_controller_android.cc
index 6e92d182c8aa540c173f9709895f13117d0527cc..34177b81742c8aac0293ddf6f74a003dbe81c27a 100644
--- a/content/browser/android/overscroll_controller_android.cc
+++ b/content/browser/android/overscroll_controller_android.cc
@@ -29,7 +29,6 @@ using ui::EdgeEffectL;
 using ui::OverscrollGlow;
 using ui::OverscrollGlowClient;
 using ui::OverscrollRefresh;
-using ui::OverscrollRefreshHandler;
 
 namespace content {
 namespace {
@@ -86,25 +85,29 @@ std::unique_ptr<OverscrollGlow> CreateGlowEffect(OverscrollGlowClient* client,
 }
 
 std::unique_ptr<OverscrollRefresh> CreateRefreshEffect(
-    OverscrollRefreshHandler* handler) {
+    const base::android::JavaRef<jobject>& overscroll_refresh_handler) {
+  if (overscroll_refresh_handler.is_null())
+    return nullptr;
+
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisablePullToRefreshEffect)) {
     return nullptr;
   }
 
-  return base::MakeUnique<OverscrollRefresh>(handler);
+  return base::MakeUnique<OverscrollRefresh>(overscroll_refresh_handler);
 }
 
 }  // namespace
 
 OverscrollControllerAndroid::OverscrollControllerAndroid(
-    ContentViewCoreImpl* content_view_core,
+    const base::android::JavaRef<jobject>& overscroll_refresh_handler,
+    ui::WindowAndroidCompositor* compositor,
     float dpi_scale)
-    : compositor_(content_view_core->GetWindowAndroid()->GetCompositor()),
+    : compositor_(compositor),
       dpi_scale_(dpi_scale),
       enabled_(true),
       glow_effect_(CreateGlowEffect(this, dpi_scale_)),
-      refresh_effect_(CreateRefreshEffect(content_view_core)) {
+      refresh_effect_(CreateRefreshEffect(overscroll_refresh_handler)) {
   DCHECK(compositor_);
 }