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

shell/android/native_viewport_application_loader.h

Index: shell/android/native_viewport_application_loader.h
diff --git a/shell/android/native_viewport_application_loader.h b/shell/android/native_viewport_application_loader.h
index e5b27df989afa617765901b20711ff25080674ff..9f3468f3e37593e42bb053c82a0866ebc0bc47e3 100644
--- a/shell/android/native_viewport_application_loader.h
+++ b/shell/android/native_viewport_application_loader.h
@@ -13,6 +13,10 @@
 #include "services/gles2/gpu_impl.h"
 #include "shell/application_manager/application_loader.h"
 
+namespace gles2 {
+class GpuState;
+}
+
 namespace mojo {
 
 class ApplicationImpl;
@@ -49,7 +53,7 @@ class NativeViewportApplicationLoader : public ApplicationLoader,
   void Create(ApplicationConnection* connection,
               InterfaceRequest<Keyboard> request) override;
 
-  scoped_refptr<gles2::GpuImpl::State> gpu_state_;
+  scoped_refptr<gles2::GpuState> gpu_state_;
   scoped_ptr<ApplicationImpl> app_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeViewportApplicationLoader);