mac: ensure ui::Compositor exists for visible RWHVs

content/public/test/test_renderer_host.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 "content/public/test/test_renderer_host.h"
 
 #include <utility>
 
 #include "base/run_loop.h"
 #include "build/build_config.h"
@@ skipping 19 matching lines @@
 #if defined(OS_WIN)
 #include "ui/base/win/scoped_ole_initializer.h"
 #endif
 
 #if defined(USE_AURA)
 #include "ui/aura/test/aura_test_helper.h"
 #include "ui/compositor/test/context_factories_for_test.h"
 #include "ui/wm/core/default_activation_client.h"
 #endif
 
+#if defined(OS_MACOSX)
+#include "ui/accelerated_widget_mac/window_resize_helper_mac.h"
+#endif
+
 namespace content {
 
 // RenderFrameHostTester ------------------------------------------------------
 
 // static
 RenderFrameHostTester* RenderFrameHostTester::For(RenderFrameHost* host) {
   return static_cast<TestRenderFrameHost*>(host);
 }
 
 // static
@@ skipping 143 matching lines @@
 #if defined(USE_AURA)
   // The ContextFactory must exist before any Compositors are created.
   bool enable_pixel_output = false;
   ui::ContextFactory* context_factory =
       ui::InitializeContextFactoryForTests(enable_pixel_output);
 
   aura_test_helper_.reset(
       new aura::test::AuraTestHelper(base::MessageLoopForUI::current()));
   aura_test_helper_->SetUp(context_factory);
   new wm::DefaultActivationClient(aura_test_helper_->root_window());
-#endif
+#endif  // USE_AURA
 
   sanity_checker_.reset(new ContentBrowserSanityChecker());
 
   DCHECK(!browser_context_);
   browser_context_.reset(CreateBrowserContext());
 
   SetContents(CreateTestWebContents());
 
   if (IsBrowserSideNavigationEnabled())
     BrowserSideNavigationSetUp();
+
+#if defined(OS_MACOSX)
+  if (!ui::WindowResizeHelperMac::Get()->task_runner()) {

[enne (OOO), 2016/05/26 00:07:06]

I'd love some feedback on what I should do here.  Here's the problem. 
content_unittests now creates a ui::Compositor where it didn't before.  In Mac
land, there's a dcheck that the WindowResizeHelperMac has a task runner
initialized on it.

This is a little bit weirdly global.  I think maybe the right thing to do here
is have a Shutdown() that clears it, so that I can always call Init/Shutdown
between tests when there aren't any compositors using this task runner?

Thoughts?

[ccameron, 2016/05/26 00:11:45]

Adding a Shutdown that tests use to clear this sounds reasonable.

+    ui::WindowResizeHelperMac::Get()->Init(
+      base::MessageLoop::current()->task_runner());
+  }
+#endif  // OS_MACOSX
 }
 
 void RenderViewHostTestHarness::TearDown() {
   if (IsBrowserSideNavigationEnabled())
     BrowserSideNavigationTearDown();
 
   SetContents(NULL);
 #if defined(USE_AURA)
   aura_test_helper_->TearDown();
   ui::TerminateContextFactoryForTests();
@@ skipping 23 matching lines @@
 BrowserContext* RenderViewHostTestHarness::CreateBrowserContext() {
   return new TestBrowserContext();
 }
 
 void RenderViewHostTestHarness::SetRenderProcessHostFactory(
     RenderProcessHostFactory* factory) {
   rvh_test_enabler_.rvh_factory_->set_render_process_host_factory(factory);
 }
 
 }  // namespace content