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

shell/android/native_viewport_application_loader.cc

Index: shell/android/native_viewport_application_loader.cc
diff --git a/shell/android/native_viewport_application_loader.cc b/shell/android/native_viewport_application_loader.cc
index 3e8c76e80e27d67d48f9ecb2d1787d4f1fe9662b..2d58b9d6e0ba5004a6b07df0c23e76a352cd33a0 100644
--- a/shell/android/native_viewport_application_loader.cc
+++ b/shell/android/native_viewport_application_loader.cc
@@ -5,6 +5,7 @@
 #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"
 
@@ -40,7 +41,10 @@ bool NativeViewportApplicationLoader::ConfigureIncomingConnection(
 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(app_.get(), gpu_state_,
+                                          request.Pass());
 }
 
 void NativeViewportApplicationLoader::Create(
@@ -52,7 +56,7 @@ void NativeViewportApplicationLoader::Create(
 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_);
 }