Remove NativeViewportClient

services/view_manager/display_manager.h

Index: services/view_manager/display_manager.h
diff --git a/services/view_manager/display_manager.h b/services/view_manager/display_manager.h
index a85a7216f439a513336de0e8712cd46ce902f296..0e86148757b64f2bd07a12249cdf8991e708febb 100644
--- a/services/view_manager/display_manager.h
+++ b/services/view_manager/display_manager.h
@@ -51,8 +51,8 @@ class DisplayManager {
 // DisplayManager implementation that connects to the services necessary to
 // actually display.
 class DefaultDisplayManager : public DisplayManager,
-                              public mojo::NativeViewportClient,
-                              public mojo::SurfaceClient {
+                              public mojo::SurfaceClient,
+                              public mojo::ErrorHandler {
  public:
   DefaultDisplayManager(
       mojo::ApplicationConnection* app_connection,
@@ -66,18 +66,20 @@ class DefaultDisplayManager : public DisplayManager,
   const mojo::ViewportMetrics& GetViewportMetrics() override;
 
  private:
-  void OnCreatedNativeViewport(uint64_t native_viewport_id);
+  void OnCreatedNativeViewport(uint64_t native_viewport_id,
+                               mojo::ViewportMetricsPtr metrics);
   void Draw();
 
-  // NativeViewportClient:
-  void OnDestroyed() override;
-  void OnMetricsChanged(mojo::ViewportMetricsPtr metrics) override;
+  void OnMetricsChanged(mojo::ViewportMetricsPtr metrics);
 
   // SurfaceClient:
   void SetIdNamespace(uint32_t id_namespace) override;
   void ReturnResources(
       mojo::Array<mojo::ReturnedResourcePtr> resources) override;
 
+  // ErrorHandler:
+  void OnConnectionError() override;
+
   mojo::ApplicationConnection* app_connection_;
   ConnectionManager* connection_manager_;