Revert "Enable FlingSchedulerMac"

This reverts commit d6ec8154.

Reason for revert: Findit identified the culprit r577957 with confidence 100.0% in the config "chromium.mac / Mac10.11 Tests"

Original change's description:
> Enable FlingSchedulerMac
> 
> Enable tests that were disabled because of this functionality missing.
> 
> Bug: 842325
> Change-Id: I6f540460f4e5f81d7ff8dd36e4abf369f0bd4785
> Reviewed-on: https://chromium-review.googlesource.com/1149612
> Reviewed-by: Jonathan Ross <jonross@chromium.org>
> Commit-Queue: ccameron <ccameron@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#577957}

TBR=ccameron@chromium.org,jonross@chromium.org

Change-Id: I4a38151ba5333ca99fb28c00f57f93f057f5fd4b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 842325, 867668
Reviewed-on: https://chromium-review.googlesource.com/1150946Reviewed-by: Yoichi Osato <yoichio@chromium.org>
Commit-Queue: Yoichi Osato <yoichio@chromium.org>
Cr-Commit-Position: refs/heads/master@{#578166}

content/browser/renderer_host/browser_compositor_view_mac.h

@@ -148,7 +148,7 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient,
 
   bool ForceNewSurfaceForTesting();
 
-  ui::Compositor* GetCompositor() const;
+  ui::Compositor* GetCompositorForTesting() const;
 
  private:
   // ui::LayerObserver implementation:

content/browser/renderer_host/browser_compositor_view_mac.mm

@@ -487,9 +487,7 @@ void BrowserCompositorMac::LayerDestroyed(ui::Layer* layer) {
   SetParentUiLayer(nullptr);
 }
 
-ui::Compositor* BrowserCompositorMac::GetCompositor() const {
-  if (parent_ui_layer_)
-    return parent_ui_layer_->GetCompositor();
+ui::Compositor* BrowserCompositorMac::GetCompositorForTesting() const {
   if (recyclable_compositor_)
     return recyclable_compositor_->compositor();
   return nullptr;

content/browser/renderer_host/input/fling_scheduler_mac.mm

@@ -21,10 +21,14 @@ ui::Compositor* FlingSchedulerMac::GetCompositor() {
   // RWHV_child_frame doesn't have DelegatedFrameHost with ui::Compositor.
   if (host_->GetView()->IsRenderWidgetHostViewChildFrame())
     return nullptr;
-  RenderWidgetHostViewMac* view =
+
+  // TODO(sahel): Uncomment this once Viz is ready on Mac.
+  // https://crbug.com/833985
+  /* RenderWidgetHostViewMac* view =
       static_cast<RenderWidgetHostViewMac*>(host_->GetView());
   if (view->BrowserCompositor())
-    return view->BrowserCompositor()->GetCompositor();
+    return view->BrowserCompositor()->Compositor();
+  } */
 
   return nullptr;
 }

content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

@@ -1837,11 +1837,11 @@ TEST_F(InputMethodMacTest, MonitorCompositionRangeForActiveWidget) {
 
 TEST_F(RenderWidgetHostViewMacTest, ClearCompositorFrame) {
   BrowserCompositorMac* browser_compositor = rwhv_mac_->BrowserCompositor();
-  ui::Compositor* ui_compositor = browser_compositor->GetCompositor();
+  ui::Compositor* ui_compositor = browser_compositor->GetCompositorForTesting();
   EXPECT_NE(ui_compositor, nullptr);
   EXPECT_TRUE(ui_compositor->IsLocked());
   rwhv_mac_->ClearCompositorFrame();
-  EXPECT_EQ(browser_compositor->GetCompositor(), ui_compositor);
+  EXPECT_EQ(browser_compositor->GetCompositorForTesting(), ui_compositor);
   EXPECT_FALSE(ui_compositor->IsLocked());
 }
 

testing/buildbot/filters/viz.content_browsertests.filter

 ### Mac
+# BrowserSideFlingBrowserTest timing out https://crbug.com/842325
+-BrowserSideFlingBrowserTest.AutoscrollFling
+-BrowserSideFlingBrowserTest.TouchpadFling
+-BrowserSideFlingBrowserTest.TouchscreenFling
+-SitePerProcessBrowserTest.TouchpadGestureFlingStart
+-SitePerProcessBrowserTest.TouchscreenGestureFlingStart