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

shell/android/native_viewport_application_loader.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 "shell/android/native_viewport_application_loader.h"
 
 #include "mojo/public/cpp/application/application_impl.h"
+#include "services/gles2/gpu_state.h"
 #include "services/native_viewport/native_viewport_impl.h"
 #include "shell/android/keyboard_impl.h"
 
 namespace mojo {
 namespace shell {
 
 NativeViewportApplicationLoader::NativeViewportApplicationLoader() {
 }
 
 NativeViewportApplicationLoader::~NativeViewportApplicationLoader() {
@@ skipping 10 matching lines @@
     mojo::ApplicationConnection* connection) {
   connection->AddService<NativeViewport>(this);
   connection->AddService<Gpu>(this);
   connection->AddService<Keyboard>(this);
   return true;
 }
 
 void NativeViewportApplicationLoader::Create(
     ApplicationConnection* connection,
     InterfaceRequest<NativeViewport> request) {
-  new native_viewport::NativeViewportImpl(app_.get(), false, request.Pass());
+  if (!gpu_state_)
+    gpu_state_ = new gles2::GpuState;
+  new native_viewport::NativeViewportImpl(false, gpu_state_, request.Pass());
 }
 
 void NativeViewportApplicationLoader::Create(
     ApplicationConnection* connection,
     InterfaceRequest<Keyboard> request) {
   new KeyboardImpl(request.Pass());
 }
 
 void NativeViewportApplicationLoader::Create(ApplicationConnection* connection,
                                              InterfaceRequest<Gpu> request) {
   if (!gpu_state_)
-    gpu_state_ = new gles2::GpuImpl::State;
+    gpu_state_ = new gles2::GpuState;
   new gles2::GpuImpl(request.Pass(), gpu_state_);
 }
 
 }  // namespace shell
 }  // namespace mojo