Remove --no-use-mus-in-renderer

content/browser/compositor/mus_browser_compositor_output_surface.h

Index: content/browser/compositor/mus_browser_compositor_output_surface.h
diff --git a/content/browser/compositor/mus_browser_compositor_output_surface.h b/content/browser/compositor/mus_browser_compositor_output_surface.h
deleted file mode 100644
index 9ad316c34966757d444ea1b2fef5c2dfe03c3e6b..0000000000000000000000000000000000000000
--- a/content/browser/compositor/mus_browser_compositor_output_surface.h
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2016 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.
-
-#ifndef CONTENT_BROWSER_COMPOSITOR_MUS_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
-#define CONTENT_BROWSER_COMPOSITOR_MUS_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
-
-#include <memory>
-#include <vector>
-
-#include "base/macros.h"
-#include "cc/output/compositor_frame_sink_client.h"
-#include "content/browser/compositor/gpu_browser_compositor_output_surface.h"
-#include "gpu/command_buffer/common/mailbox.h"
-#include "gpu/ipc/common/surface_handle.h"
-
-namespace aura {
-class Window;
-}
-
-namespace gpu {
-class GpuMemoryBufferManager;
-}
-
-namespace ui {
-class ClientCompositorFrameSink;
-}
-
-namespace content {
-
-// Adapts a WebGraphicsContext3DCommandBufferImpl into a
-// cc::OutputSurface that also handles vsync parameter updates
-// arriving from the GPU process.
-class MusBrowserCompositorOutputSurface
-    : public GpuBrowserCompositorOutputSurface,
-      public cc::CompositorFrameSinkClient {
- public:
-  MusBrowserCompositorOutputSurface(
-      aura::Window* window,
-      scoped_refptr<ui::ContextProviderCommandBuffer> context,
-      gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
-      const UpdateVSyncParametersCallback& update_vsync_parameters_callback,
-      std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
-          overlay_candidate_validator);
-
-  ~MusBrowserCompositorOutputSurface() override;
-
-  cc::BeginFrameSource* GetBeginFrameSource();
-
- protected:
-  // cc::OutputSurface implementation.
-  void SwapBuffers(cc::OutputSurfaceFrame frame) override;
-
-  // cc::CompositorFrameSinkClient:
-  void SetBeginFrameSource(cc::BeginFrameSource* source) override;
-  void ReclaimResources(const cc::ReturnedResourceArray& resources) override;
-  void SetTreeActivationCallback(const base::Closure& callback) override;
-  void DidReceiveCompositorFrameAck() override;
-  void DidLoseCompositorFrameSink() override;
-  void OnDraw(const gfx::Transform& transform,
-              const gfx::Rect& viewport,
-              bool resourceless_software_draw) override;
-  void SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) override;
-  void SetExternalTilePriorityConstraints(
-      const gfx::Rect& viewport_rect,
-      const gfx::Transform& transform) override;
-
- private:
-  uint32_t AllocateResourceId();
-  void FreeResourceId(uint32_t id);
-  const gpu::Mailbox& GetMailboxFromResourceId(uint32_t id);
-
-  aura::Window* window_;
-  std::unique_ptr<ui::ClientCompositorFrameSink> compositor_frame_sink_;
-  std::vector<uint32_t> free_resource_ids_;
-  std::vector<gpu::Mailbox> mailboxes_;
-  cc::BeginFrameSource* begin_frame_source_;
-
-  DISALLOW_COPY_AND_ASSIGN(MusBrowserCompositorOutputSurface);
-};
-
-}  // namespace content
-
-#endif  // CONTENT_BROWSER_COMPOSITOR_MUS_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_