content: Pass surfacelessness of GL context from GPU to browser

content/browser/compositor/gpu_process_transport_factory.cc

Index: content/browser/compositor/gpu_process_transport_factory.cc
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
index f50ee9a23b3d68263ac96514c8f921d56b7d90ac..441671ad1d1b11f2fb451250656f2485063b7b17 100644
--- a/content/browser/compositor/gpu_process_transport_factory.cc
+++ b/content/browser/compositor/gpu_process_transport_factory.cc
@@ -273,23 +273,19 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
         compositor->vsync_manager()));
   } else {
     DCHECK(context_provider);
+    ContextProvider::Capabilities capabilities =
+        context_provider->ContextCapabilities();
     if (!data->surface_id) {
       surface = make_scoped_ptr(new OffscreenBrowserCompositorOutputSurface(
           context_provider, compositor->vsync_manager(),
           scoped_ptr<BrowserCompositorOverlayCandidateValidator>()));
-    } else
-#if defined(USE_OZONE)
-        if (ui::OzonePlatform::GetInstance()
-                ->GetOverlayManager()
-                ->CanShowPrimaryPlaneAsOverlay()) {
+    } else if (capabilities.gpu.surfaceless) {
       surface =
           make_scoped_ptr(new GpuSurfacelessBrowserCompositorOutputSurface(
               context_provider, data->surface_id, compositor->vsync_manager(),
               CreateOverlayCandidateValidator(compositor->widget()), GL_RGB,
               BrowserGpuMemoryBufferManager::current()));
-    } else
-#endif
-    {
+    } else {
       surface = make_scoped_ptr(new GpuBrowserCompositorOutputSurface(
           context_provider, compositor->vsync_manager(),
           CreateOverlayCandidateValidator(compositor->widget())));