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..e4a34271c7a522e989846072ae462643bd061dac 100644
--- a/content/browser/android/overscroll_controller_android.cc
+++ b/content/browser/android/overscroll_controller_android.cc
@@ -99,12 +99,15 @@ std::unique_ptr<OverscrollRefresh> CreateRefreshEffect(
 
 OverscrollControllerAndroid::OverscrollControllerAndroid(
     ContentViewCoreImpl* content_view_core,
+    OverscrollRefreshHandler* overscroll_refresh_handler,
     float dpi_scale)
     : compositor_(content_view_core->GetWindowAndroid()->GetCompositor()),

[Jinsuk Kim, 2016/11/25 01:49:18]

Now you can pass the compositor object directly - then you can get rid of the
dependency on CVC.

[rlanday, 2016/11/29 00:46:25]

Done

       dpi_scale_(dpi_scale),
       enabled_(true),
-      glow_effect_(CreateGlowEffect(this, dpi_scale_)),
-      refresh_effect_(CreateRefreshEffect(content_view_core)) {
+      glow_effect_(CreateGlowEffect(this, dpi_scale_)) {
+  if (overscroll_refresh_handler) {
+    refresh_effect_ = CreateRefreshEffect(overscroll_refresh_handler);

[Jinsuk Kim, 2016/11/25 01:49:18]

How about keep this intact but update CreateRefreshEffect to handle null
pointer?

[rlanday, 2016/11/29 00:46:25]

Done

+  }
   DCHECK(compositor_);
 }