gpu: Use mus gpu interface in non-mus chrome.

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 35 matching lines @@
                    public base::NonThreadSafe {
  public:
   GpuService(const gpu::GPUInfo& gpu_info,
              std::unique_ptr<gpu::GpuWatchdogThread> watchdog,
              gpu::GpuMemoryBufferFactory* memory_buffer_factory,
              scoped_refptr<base::SingleThreadTaskRunner> io_runner);
 
   ~GpuService() override;
 
   void InitializeWithHost(mojom::GpuHostPtr gpu_host,
-                          const gpu::GpuPreferences& preferences);
+                          const gpu::GpuPreferences& preferences,
+                          gpu::SyncPointManager* sync_point_manager = nullptr,
+                          base::WaitableEvent* shutdown_event = nullptr);
   void Bind(mojom::GpuServiceRequest request);
 
   media::MediaGpuChannelManager* media_gpu_channel_manager() {
     return media_gpu_channel_manager_.get();
   }
 
   gpu::GpuChannelManager* gpu_channel_manager() {
     return gpu_channel_manager_.get();
   }
 
+  gpu::GpuWatchdogThread* watchdog_thread() { return watchdog_thread_.get(); }
+
  private:
   friend class GpuMain;
 
   gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferFromeHandle(
       gfx::GpuMemoryBufferHandle buffer_handle,
       gfx::GpuMemoryBufferId id,
       const gfx::Size& size,
       gfx::BufferFormat format,
       int client_id);
 
-  gpu::SyncPointManager* sync_point_manager() {
-    return owned_sync_point_manager_.get();
-  }
+  gpu::SyncPointManager* sync_point_manager() { return sync_point_manager_; }
 
   gpu::gles2::MailboxManager* mailbox_manager() {
     return gpu_channel_manager_->mailbox_manager();
   }
 
   gl::GLShareGroup* share_group() {
     return gpu_channel_manager_->share_group();
   }
 
   const gpu::GPUInfo& gpu_info() const { return gpu_info_; }
@@ skipping 41 matching lines @@
   std::unique_ptr<gpu::GpuWatchdogThread> watchdog_thread_;
 
   gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory_;
 
   gpu::GpuPreferences gpu_preferences_;
 
   // Information about the GPU, such as device and vendor ID.
   gpu::GPUInfo gpu_info_;
 
   mojom::GpuHostPtr gpu_host_;
-  std::unique_ptr<gpu::SyncPointManager> owned_sync_point_manager_;
   std::unique_ptr<gpu::GpuChannelManager> gpu_channel_manager_;
   std::unique_ptr<media::MediaGpuChannelManager> media_gpu_channel_manager_;
+
+  // On some platforms (e.g. android webview), the SyncPointManager comes from
+  // external sources.
+  std::unique_ptr<gpu::SyncPointManager> owned_sync_point_manager_;
+  gpu::SyncPointManager* sync_point_manager_ = nullptr;
+
   mojo::BindingSet<mojom::GpuService> bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuService);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_GPU_GPU_SERVICE_H_