Add a Display and ContextProvider concept to mojom, use to recreate

services/view_manager/display_manager.cc

Index: services/view_manager/display_manager.cc
diff --git a/services/view_manager/display_manager.cc b/services/view_manager/display_manager.cc
index 0e4f3b8f48f9bdd4f387722a56b5175a717e4838..9ed3a5accc78e273d0fa8e0bb586bddc59236047 100644
--- a/services/view_manager/display_manager.cc
+++ b/services/view_manager/display_manager.cc
@@ -95,10 +95,9 @@ void DefaultDisplayManager::Init(ConnectionManager* connection_manager) {
   app_impl_->ConnectToService("mojo:native_viewport_service",
                               &native_viewport_);
   native_viewport_.set_error_handler(this);
-  native_viewport_->Create(
-      metrics_.size->Clone(),
-      base::Bind(&DefaultDisplayManager::OnCreatedNativeViewport,
-                 weak_factory_.GetWeakPtr()));
+  native_viewport_->Create(metrics_.size->Clone(),
+                           base::Bind(&DefaultDisplayManager::OnMetricsChanged,
+                                      weak_factory_.GetWeakPtr()));
   native_viewport_->Show();
 
   app_impl_->ConnectToService("mojo:surfaces_service", &surface_);
@@ -137,12 +136,6 @@ const mojo::ViewportMetrics& DefaultDisplayManager::GetViewportMetrics() {
   return metrics_;
 }
 
-void DefaultDisplayManager::OnCreatedNativeViewport(
-    uint64_t native_viewport_id,
-    mojo::ViewportMetricsPtr metrics) {
-  OnMetricsChanged(metrics.Pass());
-}
-
 void DefaultDisplayManager::Draw() {
   if (!surface_allocated_) {
     surface_->CreateSurface(kLocalSurfaceID);
@@ -169,7 +162,7 @@ void DefaultDisplayManager::Draw() {
   auto qualified_id = mojo::SurfaceId::New();
   qualified_id->id_namespace = id_namespace_;
   qualified_id->local = kLocalSurfaceID;
-  native_viewport_->SubmittedFrame(qualified_id.Pass());
+  // native_viewport_->SubmittedFrame(qualified_id.Pass());
 }
 
 void DefaultDisplayManager::OnMetricsChanged(mojo::ViewportMetricsPtr metrics) {
@@ -193,7 +186,7 @@ void DefaultDisplayManager::SetIdNamespace(uint32_t id_namespace) {
     auto qualified_id = mojo::SurfaceId::New();
     qualified_id->id_namespace = id_namespace_;
     qualified_id->local = kLocalSurfaceID;
-    native_viewport_->SubmittedFrame(qualified_id.Pass());
+    // native_viewport_->SubmittedFrame(qualified_id.Pass());
   }
 }