blimp: Set up the CompositorDependencies for blimp in Chrome.

blimp/client/public/compositor/compositor_dependencies.h

Index: blimp/client/public/compositor/compositor_dependencies.h
diff --git a/blimp/client/public/compositor/compositor_dependencies.h b/blimp/client/public/compositor/compositor_dependencies.h
index 954ac9fbcf12ad4dc0ad45edddf567df635baf6e..b80d6d916916249d1912da73ed5f1800906289d7 100644
--- a/blimp/client/public/compositor/compositor_dependencies.h
+++ b/blimp/client/public/compositor/compositor_dependencies.h
@@ -25,8 +25,15 @@ namespace client {
 // is expected to outlive all BlimpContents instances.
 class CompositorDependencies {
  public:
-  using ContextProviderCallback =
-      base::Callback<void(const scoped_refptr<cc::ContextProvider>&)>;
+  struct ContextProviders {
+    ContextProviders();
+    ~ContextProviders();
+
+    scoped_refptr<cc::ContextProvider> compositor_context_provider;
+    scoped_refptr<cc::ContextProvider> worker_context_provider;
+  };
+
+  using ContextProviderCallback = base::Callback<void(const ContextProviders&)>;
 
   virtual ~CompositorDependencies() = default;
 
@@ -34,11 +41,11 @@ class CompositorDependencies {
   virtual cc::LayerTreeSettings* GetLayerTreeSettings() = 0;
   virtual gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() = 0;
   virtual cc::SurfaceManager* GetSurfaceManager() = 0;
-  virtual uint32_t AllocateSurfaceId() = 0;
+  virtual uint32_t AllocateSurfaceClientId() = 0;
 
   // This call may return synchronously if the ContextProvider has already been
   // created.
-  virtual void GetContextProvider(const ContextProviderCallback& callback) = 0;
+  virtual void GetContextProviders(const ContextProviderCallback& callback) = 0;
 };
 
 }  // namespace client