Delete OnscreenDisplayClient and TopLevelDisplayClient.

android_webview/browser/hardware_renderer.h

 // 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.
 
 #ifndef ANDROID_WEBVIEW_BROWSER_HARDWARE_RENDERER_H_
 #define ANDROID_WEBVIEW_BROWSER_HARDWARE_RENDERER_H_
 
 #include <memory>
 
 #include "android_webview/browser/render_thread_manager.h"
@@ skipping 24 matching lines @@
   explicit HardwareRenderer(RenderThreadManager* state);
   ~HardwareRenderer() override;
 
   void DrawGL(AwDrawGLInfo* draw_info, const ScopedAppGLStateRestore& gl_state);
   void CommitFrame();
 
   void SetBackingFrameBufferObject(int framebuffer_binding_ext);
 
  private:
   // cc::DisplayClient overrides.
-  void OutputSurfaceLost() override {}
-  void SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) override {}
+  void DisplayOutputSurfaceLost() override {}
+  void DisplaySetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) override {}
 
   // cc::SurfaceFactoryClient implementation.
   void ReturnResources(const cc::ReturnedResourceArray& resources) override;
   void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override;
 
   void ReturnResourcesInChildFrame();
   void ReturnResourcesToCompositor(const cc::ReturnedResourceArray& resources,
                                    uint32_t compositor_routing_id,
                                    uint32_t output_surface_id);
 
@@ skipping 29 matching lines @@
 
   // This is owned by |display_|.
   ParentOutputSurface* output_surface_;
 
   DISALLOW_COPY_AND_ASSIGN(HardwareRenderer);
 };
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_HARDWARE_RENDERER_H_