gpu: Bind the mojom::GpuService request on the IO thread.

services/ui/gpu/gpu_service.h

 // Copyright 2016 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.
 
 #ifndef SERVICES_UI_GPU_GPU_SERVICE_H_
 #define SERVICES_UI_GPU_GPU_SERVICE_H_
 
 #include "base/callback.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/non_thread_safe.h"
@@ skipping 25 matching lines @@
 }
 
 namespace ui {
 
 class GpuMain;
 
 // This runs in the GPU process, and communicates with the gpu host (which is
 // the window server) over the mojom APIs. This is responsible for setting up
 // the connection to clients, allocating/free'ing gpu memory etc.
 class GpuService : public gpu::GpuChannelManagerDelegate,
-                   public mojom::GpuService,
-                   public base::NonThreadSafe {
+                   public mojom::GpuService {
  public:
   GpuService(const gpu::GPUInfo& gpu_info,
              std::unique_ptr<gpu::GpuWatchdogThread> watchdog,
              gpu::GpuMemoryBufferFactory* memory_buffer_factory,
              scoped_refptr<base::SingleThreadTaskRunner> io_runner,
              const gpu::GpuFeatureInfo& gpu_feature_info);
 
   ~GpuService() override;
 
   void UpdateGPUInfoFromPreferences(const gpu::GpuPreferences& preferences);
@@ skipping 88 matching lines @@
   void DestroyingVideoSurface(
       int32_t surface_id,
       const DestroyingVideoSurfaceCallback& callback) override;
   void WakeUpGpu() override;
   void DestroyAllChannels() override;
   void Crash() override;
   void Hang() override;
   void ThrowJavaException() override;
   void Stop(const StopCallback& callback) override;
 
+  scoped_refptr<base::SingleThreadTaskRunner> main_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> io_runner_;
 
   // An event that will be signalled when we shutdown.
   base::WaitableEvent shutdown_event_;
 
   std::unique_ptr<gpu::GpuWatchdogThread> watchdog_thread_;
 
   gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory_;
 
   gpu::GpuPreferences gpu_preferences_;
@@ skipping 12 matching lines @@
   // external sources.
   std::unique_ptr<gpu::SyncPointManager> owned_sync_point_manager_;
   gpu::SyncPointManager* sync_point_manager_ = nullptr;
 
   // Whether this is running in the same process as the gpu host.
   bool in_host_process_ = false;
   base::Time start_time_;
 
   mojo::BindingSet<mojom::GpuService> bindings_;
 
+  base::WeakPtr<GpuService> weak_ptr_;
+  base::WeakPtrFactory<GpuService> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(GpuService);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_GPU_GPU_SERVICE_H_