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

services/native_viewport/main.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 "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/common/tracing_impl.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_connection.h"
@@ skipping 14 matching lines @@
 class NativeViewportAppDelegate : public mojo::ApplicationDelegate,
                                   public mojo::InterfaceFactory<NativeViewport>,
                                   public mojo::InterfaceFactory<Gpu> {
  public:
   NativeViewportAppDelegate() : is_headless_(false) {}
   ~NativeViewportAppDelegate() override {}
 
  private:
   // mojo::ApplicationDelegate implementation.
   void Initialize(mojo::ApplicationImpl* application) override {
-    app_ = application;
+    tracing_.Initialize(application);
 
-    tracing_.Initialize(app_);
-
-    if (app_->HasArg(mojo::kUseTestConfig))
+    if (application->HasArg(mojo::kUseTestConfig))
       gfx::GLSurface::InitializeOneOffForTests();
-    else if (app_->HasArg(mojo::kUseOSMesa))
+    else if (application->HasArg(mojo::kUseOSMesa))
       gfx::GLSurface::InitializeOneOff(gfx::kGLImplementationOSMesaGL);
     else
       gfx::GLSurface::InitializeOneOff();
 
-    is_headless_ = app_->HasArg(mojo::kUseHeadlessConfig);
+    is_headless_ = application->HasArg(mojo::kUseHeadlessConfig);
   }
 
   bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
     connection->AddService<NativeViewport>(this);
     connection->AddService<Gpu>(this);
     return true;
   }
 
   // mojo::InterfaceFactory<NativeViewport> implementation.
   void Create(ApplicationConnection* connection,
               mojo::InterfaceRequest<NativeViewport> request) override {
-    new NativeViewportImpl(app_, is_headless_, request.Pass());
+    if (!gpu_state_.get())
+      gpu_state_ = new gles2::GpuState;
+    new NativeViewportImpl(is_headless_, gpu_state_, request.Pass());
   }
 
   // mojo::InterfaceFactory<Gpu> implementation.
   void Create(ApplicationConnection* connection,
               mojo::InterfaceRequest<Gpu> request) override {
     if (!gpu_state_.get())
-      gpu_state_ = new gles2::GpuImpl::State;
+      gpu_state_ = new gles2::GpuState;
     new gles2::GpuImpl(request.Pass(), gpu_state_);
   }
 
-  mojo::ApplicationImpl* app_;
-  scoped_refptr<gles2::GpuImpl::State> gpu_state_;
+  scoped_refptr<gles2::GpuState> gpu_state_;
   bool is_headless_;
   mojo::TracingImpl tracing_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeViewportAppDelegate);
 };
 }
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(
       new native_viewport::NativeViewportAppDelegate);
   runner.set_message_loop_type(base::MessageLoop::TYPE_UI);
   return runner.Run(shell_handle);
 }