cc: Remove things from OutputSurface and CompositorFrameSink.

cc/output/output_surface_unittest.cc

Index: cc/output/output_surface_unittest.cc
diff --git a/cc/output/output_surface_unittest.cc b/cc/output/output_surface_unittest.cc
index d4fa9f7b3fe87e4f9ce27d14526767d111874ed3..780f1bd421dd67a66749afec47cb836324cf7fa7 100644
--- a/cc/output/output_surface_unittest.cc
+++ b/cc/output/output_surface_unittest.cc
@@ -4,13 +4,12 @@
 
 #include "cc/output/output_surface.h"
 
+#include <utility>
+
 #include "base/memory/ptr_util.h"
-#include "base/test/test_simple_task_runner.h"
-#include "cc/output/managed_memory_policy.h"
-#include "cc/output/output_surface_client.h"
+#include "cc/output/compositor_frame.h"
+#include "cc/output/output_surface.h"
 #include "cc/output/software_output_device.h"
-#include "cc/test/begin_frame_args_test.h"
-#include "cc/test/fake_output_surface.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"
@@ -24,23 +23,11 @@ class TestOutputSurface : public OutputSurface {
  public:
   explicit TestOutputSurface(
       scoped_refptr<TestContextProvider> context_provider)
-      : OutputSurface(std::move(context_provider), nullptr, nullptr) {}
-
-  TestOutputSurface(scoped_refptr<TestContextProvider> context_provider,
-                    scoped_refptr<TestContextProvider> worker_context_provider)
-      : OutputSurface(std::move(context_provider),
-                      std::move(worker_context_provider),
-                      nullptr) {}
+      : OutputSurface(std::move(context_provider)) {}
 
   explicit TestOutputSurface(
       std::unique_ptr<SoftwareOutputDevice> software_device)
-      : OutputSurface(nullptr, nullptr, std::move(software_device)) {}
-
-  TestOutputSurface(scoped_refptr<TestContextProvider> context_provider,
-                    std::unique_ptr<SoftwareOutputDevice> software_device)
-      : OutputSurface(std::move(context_provider),
-                      nullptr,
-                      std::move(software_device)) {}
+      : OutputSurface(std::move(software_device)) {}
 
   void SwapBuffers(CompositorFrame frame) override {
     client_->DidSwapBuffersComplete();
@@ -87,7 +74,7 @@ void TestSoftwareOutputDevice::EnsureBackbuffer() {
   ensure_backbuffer_count_++;
 }
 
-TEST(OutputSurfaceTest, ClientPointerIndicatesBindToClientSuccess) {
+TEST(OutputSurfaceTest, ContextLossInformsClient) {
   scoped_refptr<TestContextProvider> provider = TestContextProvider::Create();
   TestOutputSurface output_surface(provider);
   EXPECT_FALSE(output_surface.HasClient());
@@ -104,28 +91,9 @@ TEST(OutputSurfaceTest, ClientPointerIndicatesBindToClientSuccess) {
   EXPECT_TRUE(client.did_lose_output_surface_called());
 }
 
-TEST(OutputSurfaceTest, ClientPointerIndicatesWorkerBindToClientSuccess) {
-  scoped_refptr<TestContextProvider> provider = TestContextProvider::Create();
-  scoped_refptr<TestContextProvider> worker_provider =
-      TestContextProvider::Create();
-  TestOutputSurface output_surface(provider, worker_provider);
-  EXPECT_FALSE(output_surface.HasClient());
-
-  FakeOutputSurfaceClient client;
-  EXPECT_TRUE(output_surface.BindToClient(&client));
-  EXPECT_TRUE(output_surface.HasClient());
-
-  // Verify DidLoseOutputSurface callback is hooked up correctly.
-  EXPECT_FALSE(client.did_lose_output_surface_called());
-  output_surface.context_provider()->ContextGL()->LoseContextCHROMIUM(
-      GL_GUILTY_CONTEXT_RESET_ARB, GL_INNOCENT_CONTEXT_RESET_ARB);
-  output_surface.context_provider()->ContextGL()->Flush();
-  EXPECT_TRUE(client.did_lose_output_surface_called());
-}
-
 // TODO(danakj): Add a test for worker context failure as well when
 // OutputSurface creates/binds it.
-TEST(OutputSurfaceTest, ClientPointerIndicatesBindToClientFailure) {
+TEST(OutputSurfaceTest, ContextLossFailsBind) {
   scoped_refptr<TestContextProvider> context_provider =
       TestContextProvider::Create();
 
@@ -141,12 +109,12 @@ TEST(OutputSurfaceTest, ClientPointerIndicatesBindToClientFailure) {
 }
 
 TEST(OutputSurfaceTest, SoftwareOutputDeviceBackbufferManagement) {
-  TestSoftwareOutputDevice* software_output_device =
-      new TestSoftwareOutputDevice();
+  auto device_owned = base::MakeUnique<TestSoftwareOutputDevice>();
+  TestSoftwareOutputDevice* software_output_device = device_owned.get();
 
   // TestOutputSurface now owns software_output_device and has responsibility to
   // free it.
-  TestOutputSurface output_surface(base::WrapUnique(software_output_device));
+  TestOutputSurface output_surface(std::move(device_owned));
 
   EXPECT_EQ(0, software_output_device->ensure_backbuffer_count());
   EXPECT_EQ(0, software_output_device->discard_backbuffer_count());