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

services/gles2/gpu_impl.cc

Index: services/gles2/gpu_impl.cc
diff --git a/services/gles2/gpu_impl.cc b/services/gles2/gpu_impl.cc
index f3e351ed7f32a35ebf2aa585260ce63e19bfcfbd..896bb18bb15609482078cbf6e72bab3b4ba23df7 100644
--- a/services/gles2/gpu_impl.cc
+++ b/services/gles2/gpu_impl.cc
@@ -15,40 +15,14 @@
 
 namespace gles2 {
 
-GpuImpl::State::State()
-    : control_thread_("gpu_command_buffer_control"),
-      sync_point_manager_(gpu::SyncPointManager::Create(true)),
-      share_group_(new gfx::GLShareGroup),
-      mailbox_manager_(new gpu::gles2::MailboxManagerImpl) {
-  control_thread_.Start();
-}
-
-GpuImpl::State::~State() {
-}
-
 GpuImpl::GpuImpl(mojo::InterfaceRequest<Gpu> request,
-                 const scoped_refptr<State>& state)
+                 const scoped_refptr<GpuState>& state)
     : binding_(this, request.Pass()), state_(state) {
 }
 
 GpuImpl::~GpuImpl() {
 }
 
-void GpuImpl::CreateOnscreenGLES2Context(
-    uint64_t native_viewport_id,
-    mojo::SizePtr size,
-    mojo::InterfaceRequest<mojo::CommandBuffer> request,
-    mojo::ViewportParameterListenerPtr listener) {
-  gfx::AcceleratedWidget widget = bit_cast<gfx::AcceleratedWidget>(
-      static_cast<uintptr_t>(native_viewport_id));
-  new CommandBufferImpl(
-      request.Pass(), listener.Pass(), state_->control_task_runner(),
-      state_->sync_point_manager(),
-      make_scoped_ptr(new CommandBufferDriver(
-          widget, size.To<gfx::Size>(), state_->share_group(),
-          state_->mailbox_manager(), state_->sync_point_manager())));
-}
-
 void GpuImpl::CreateOffscreenGLES2Context(
     mojo::InterfaceRequest<mojo::CommandBuffer> request) {
   new CommandBufferImpl(request.Pass(), mojo::ViewportParameterListenerPtr(),