cc: Make OutputSurface::BindToClient pure virtual and not return bool

content/browser/compositor/reflector_impl_unittest.cc

 // Copyright 2015 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 "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "build/build_config.h"
 #include "cc/output/output_surface_frame.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/scheduler/delay_based_time_source.h"
-#include "cc/test/fake_output_surface_client.h"
 #include "cc/test/test_context_provider.h"
 #include "cc/test/test_web_graphics_context_3d.h"
 #include "components/display_compositor/compositor_overlay_candidate_validator.h"
 #include "content/browser/compositor/browser_compositor_output_surface.h"
 #include "content/browser/compositor/reflector_impl.h"
 #include "content/browser/compositor/reflector_texture.h"
 #include "content/browser/compositor/test/no_transport_image_transport_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/layer.h"
@@ skipping 58 matching lines @@
                     scoped_refptr<ui::CompositorVSyncManager> vsync_manager,
                     cc::SyntheticBeginFrameSource* begin_frame_source)
       : BrowserCompositorOutputSurface(std::move(context_provider),
                                        std::move(vsync_manager),
                                        begin_frame_source,
                                        CreateTestValidatorOzone()) {
   }
 
   void SetFlip(bool flip) { capabilities_.flipped_output_surface = flip; }
 
+  void BindToClient(cc::OutputSurfaceClient* client) override {}
   void EnsureBackbuffer() override {}
   void DiscardBackbuffer() override {}
   void BindFramebuffer() override {}
   void Reshape(const gfx::Size& size,
                float device_scale_factor,
                const gfx::ColorSpace& color_space,
                bool has_alpha) override {}
   void SwapBuffers(cc::OutputSurfaceFrame frame) override {}
   uint32_t GetFramebufferCopyTextureFormat() override { return GL_RGB; }
   bool IsDisplayedAsOverlayPlane() const override { return false; }
@@ skipping 33 matching lines @@
             new NoTransportImageTransportFactory));
     message_loop_.reset(new base::MessageLoop());
     task_runner_ = message_loop_->task_runner();
     compositor_task_runner_ = new FakeTaskRunner();
     begin_frame_source_.reset(new cc::DelayBasedBeginFrameSource(
         base::MakeUnique<cc::DelayBasedTimeSource>(
             compositor_task_runner_.get())));
     compositor_.reset(
         new ui::Compositor(context_factory, compositor_task_runner_.get()));
     compositor_->SetAcceleratedWidget(gfx::kNullAcceleratedWidget);
+
+    auto context_provider = cc::TestContextProvider::Create();
+    context_provider->BindToCurrentThread();
     output_surface_ = base::MakeUnique<TestOutputSurface>(
-        cc::TestContextProvider::Create(cc::TestWebGraphicsContext3D::Create()),
-        compositor_->vsync_manager(), begin_frame_source_.get());
-    CHECK(output_surface_->BindToClient(&output_surface_client_));
+        std::move(context_provider), compositor_->vsync_manager(),
+        begin_frame_source_.get());
 
     root_layer_.reset(new ui::Layer(ui::LAYER_SOLID_COLOR));
     compositor_->SetRootLayer(root_layer_.get());
     mirroring_layer_.reset(new ui::Layer(ui::LAYER_SOLID_COLOR));
     compositor_->root_layer()->Add(mirroring_layer_.get());
     output_surface_->Reshape(kSurfaceSize, 1.f, gfx::ColorSpace(), false);
     mirroring_layer_->SetBounds(gfx::Rect(kSurfaceSize));
   }
 
   void SetUpReflector() {
@@ skipping 15 matching lines @@
     ImageTransportFactory::Terminate();
   }
 
   void UpdateTexture() {
     reflector_->OnSourcePostSubBuffer(kSubRect, kSurfaceSize);
   }
 
  protected:
   scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_;
   std::unique_ptr<cc::SyntheticBeginFrameSource> begin_frame_source_;
-  cc::FakeOutputSurfaceClient output_surface_client_;
   std::unique_ptr<base::MessageLoop> message_loop_;
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
   std::unique_ptr<ui::Compositor> compositor_;
   std::unique_ptr<ui::Layer> root_layer_;
   std::unique_ptr<ui::Layer> mirroring_layer_;
   std::unique_ptr<ReflectorImpl> reflector_;
   std::unique_ptr<TestOutputSurface> output_surface_;
 };
 
 namespace {
@@ skipping 35 matching lines @@
   plane_2.plane_z_order = 1;
   list.push_back(plane_1);
   list.push_back(plane_2);
   output_surface_->GetOverlayCandidateValidator()->CheckOverlaySupport(&list);
   EXPECT_FALSE(list[0].overlay_handled);
 }
 #endif  // defined(USE_OZONE)
 
 }  // namespace
 }  // namespace content