Revert of services/ui: Avoid thread hopping in the gpu process.

services/ui/gpu/gpu_service_internal.h

Index: services/ui/gpu/gpu_service_internal.h
diff --git a/services/ui/gpu/gpu_service_internal.h b/services/ui/gpu/gpu_service_internal.h
index 5b151d72ee6fa380c33a0326181a4c6a087f9652..82f93d05e439ccb4fbd3ba366343938a2275dcb5 100644
--- a/services/ui/gpu/gpu_service_internal.h
+++ b/services/ui/gpu/gpu_service_internal.h
@@ -48,6 +48,14 @@
 
   void Add(mojom::GpuServiceInternalRequest request);
 
+  gpu::GpuChannelManager* gpu_channel_manager() const {
+    return gpu_channel_manager_.get();
+  }
+
+  gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory() const {
+    return gpu_memory_buffer_factory_;
+  }
+
   // TODO(sad): These should be mojom API.
   gfx::GpuMemoryBufferHandle CreateGpuMemoryBuffer(
       gfx::GpuMemoryBufferId id,
@@ -67,8 +75,12 @@
                      gpu::GpuWatchdogThread* watchdog,
                      gpu::GpuMemoryBufferFactory* memory_buffer_factory);
 
-  void BindOnGpuThread(mojom::GpuServiceInternalRequest request);
-
+  void EstablishGpuChannelInternal(int32_t client_id,
+                                   uint64_t client_tracing_id,
+                                   bool preempts,
+                                   bool allow_view_command_buffers,
+                                   bool allow_real_time_streams,
+                                   const EstablishGpuChannelCallback& callback);
   gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferFromeHandle(
       gfx::GpuMemoryBufferHandle buffer_handle,
       gfx::GpuMemoryBufferId id,
@@ -100,6 +112,15 @@
       uint64_t client_tracing_id,
       bool is_gpu_host,
       const EstablishGpuChannelCallback& callback) override;
+
+  void InitializeOnGpuThread(base::WaitableEvent* event);
+  void EstablishGpuChannelOnGpuThread(
+      int client_id,
+      uint64_t client_tracing_id,
+      bool preempts,
+      bool allow_view_command_buffers,
+      bool allow_real_time_streams,
+      mojo::ScopedMessagePipeHandle* channel_handle);
 
   // The main thread task runner.
   scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;