cc: Remove things from OutputSurface and CompositorFrameSink.

ui/compositor/test/in_process_context_factory.cc

 // Copyright 2014 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 "ui/compositor/test/in_process_context_factory.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 31 matching lines @@
   ~FakeReflector() override {}
   void OnMirroringCompositorResized() override {}
   void AddMirroringLayer(Layer* layer) override {}
   void RemoveMirroringLayer(Layer* layer) override {}
 };
 
 // An OutputSurface implementation that directly draws and swaps to an actual
 // GL surface.
 class DirectOutputSurface : public cc::OutputSurface {
  public:
-  DirectOutputSurface(
-      scoped_refptr<InProcessContextProvider> context_provider,
-      scoped_refptr<InProcessContextProvider> worker_context_provider)
-      : cc::OutputSurface(std::move(context_provider),
-                          std::move(worker_context_provider),
-                          nullptr),
+  DirectOutputSurface(scoped_refptr<InProcessContextProvider> context_provider)
+      : cc::OutputSurface(std::move(context_provider)),
         weak_ptr_factory_(this) {}
 
   ~DirectOutputSurface() override {}
 
   // cc::OutputSurface implementation.
   bool BindToClient(cc::OutputSurfaceClient* client) override {
     if (!OutputSurface::BindToClient(client))
       return false;
     return true;
   }
@@ skipping 86 matching lines @@
   scoped_refptr<InProcessContextProvider> context_provider =
       InProcessContextProvider::Create(
           attribs, shared_worker_context_provider_.get(),
           &gpu_memory_buffer_manager_, &image_factory_, compositor->widget(),
           "UICompositor");
 
   std::unique_ptr<cc::OutputSurface> display_output_surface;
   if (use_test_surface_) {
     bool flipped_output_surface = false;
     display_output_surface = base::MakeUnique<cc::PixelTestOutputSurface>(
-        context_provider, shared_worker_context_provider_,
-        flipped_output_surface);
+        context_provider, flipped_output_surface);
   } else {
-    display_output_surface = base::MakeUnique<DirectOutputSurface>(
-        context_provider, shared_worker_context_provider_);
+    display_output_surface =
+        base::MakeUnique<DirectOutputSurface>(context_provider);
   }
 
   std::unique_ptr<cc::DelayBasedBeginFrameSource> begin_frame_source(
       new cc::DelayBasedBeginFrameSource(
           base::MakeUnique<cc::DelayBasedTimeSource>(
               compositor->task_runner().get())));
   std::unique_ptr<cc::DisplayScheduler> scheduler(new cc::DisplayScheduler(
       begin_frame_source.get(), compositor->task_runner().get(),
       display_output_surface->capabilities().max_frames_pending));
   per_compositor_data_[compositor.get()] = base::MakeUnique<cc::Display>(
@@ skipping 88 matching lines @@
 
 void InProcessContextFactory::AddObserver(ContextFactoryObserver* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void InProcessContextFactory::RemoveObserver(ContextFactoryObserver* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
 }  // namespace ui