Make lost context and error message callbacks on GpuControl go to client

gpu/ipc/client/command_buffer_proxy_impl.h

Index: gpu/ipc/client/command_buffer_proxy_impl.h
diff --git a/gpu/ipc/client/command_buffer_proxy_impl.h b/gpu/ipc/client/command_buffer_proxy_impl.h
index cd72f7828844505d15c543cf786c2f3d206976d0..89347bf2910c7b69352a0496afa0efbd98c8f1e5 100644
--- a/gpu/ipc/client/command_buffer_proxy_impl.h
+++ b/gpu/ipc/client/command_buffer_proxy_impl.h
@@ -87,6 +87,7 @@ class GPU_EXPORT CommandBufferProxyImpl
   void DestroyTransferBuffer(int32_t id) override;
 
   // gpu::GpuControl implementation:
+  void SetGpuControlClient(GpuControlClient* client) override;
   gpu::Capabilities GetCapabilities() override;
   int32_t CreateImage(ClientBuffer buffer,
                       size_t width,
@@ -113,7 +114,6 @@ class GPU_EXPORT CommandBufferProxyImpl
   bool CanWaitUnverifiedSyncToken(const gpu::SyncToken* sync_token) override;
 
   bool ProduceFrontBuffer(const gpu::Mailbox& mailbox);
-  void SetContextLostCallback(const base::Closure& callback);
 
   void AddDeletionObserver(DeletionObserver* observer);
   void RemoveDeletionObserver(DeletionObserver* observer);
@@ -197,6 +197,9 @@ class GPU_EXPORT CommandBufferProxyImpl
 
   base::Lock* lock_;
 
+  // Client that wants to listen for important events on the GpuControl.
+  gpu::GpuControlClient* gpu_control_client_;
+
   // Unowned list of DeletionObservers.
   base::ObserverList<DeletionObserver> deletion_observers_;
 
@@ -228,8 +231,6 @@ class GPU_EXPORT CommandBufferProxyImpl
   // Last verified fence sync.
   uint64_t verified_fence_sync_release_;
 
-  base::Closure context_lost_callback_;
-
   GpuConsoleMessageCallback console_message_callback_;
 
   // Tasks to be invoked in SignalSyncPoint responses.