Make sure BitmapUploader Returns Resources

components/bitmap_uploader/bitmap_uploader.h

Index: components/bitmap_uploader/bitmap_uploader.h
diff --git a/components/bitmap_uploader/bitmap_uploader.h b/components/bitmap_uploader/bitmap_uploader.h
index 65162ac9c2b56e45341e62eeff205b7fc670fe83..86b341a0afa22f54bfd3e268a488cc1c69d0349d 100644
--- a/components/bitmap_uploader/bitmap_uploader.h
+++ b/components/bitmap_uploader/bitmap_uploader.h
@@ -12,6 +12,7 @@
 #include "base/macros.h"
 #include "components/bitmap_uploader/bitmap_uploader_export.h"
 #include "components/mus/public/cpp/window_surface.h"
+#include "components/mus/public/cpp/window_surface_client.h"
 #include "components/mus/public/interfaces/compositor_frame.mojom.h"
 #include "components/mus/public/interfaces/gpu.mojom.h"
 #include "gpu/GLES2/gl2chromium.h"
@@ -29,10 +30,10 @@ BITMAP_UPLOADER_EXPORT extern const char kBitmapUploaderForAcceleratedWidget[];
 // BitmapUploader is useful if you want to draw a bitmap or color in a
 // mus::Window.
 class BITMAP_UPLOADER_EXPORT BitmapUploader
-    : NON_EXPORTED_BASE(public mus::mojom::SurfaceClient) {
+    : NON_EXPORTED_BASE(mus::WindowSurfaceClient) {
  public:
   explicit BitmapUploader(mus::Window* window);
-  ~BitmapUploader() override;
+  ~BitmapUploader();

[rjkroege, 2016/04/06 18:50:02]

don't you need to still override?

[Fady Samuel, 2016/04/06 18:52:18]

Done.

 
   void Init(mojo::Connector* connector);
 
@@ -61,8 +62,9 @@ class BITMAP_UPLOADER_EXPORT BitmapUploader
 
   void SetIdNamespace(uint32_t id_namespace);
 
-  // SurfaceClient implementation.
-  void ReturnResources(
+  // WindowSurfaceClient implementation.
+  void OnResourcesReturned(
+      mus::WindowSurface* surface,
       mojo::Array<mus::mojom::ReturnedResourcePtr> resources) override;
 
   mus::Window* window_;
@@ -79,7 +81,6 @@ class BITMAP_UPLOADER_EXPORT BitmapUploader
   uint32_t next_resource_id_;
   uint32_t id_namespace_;
   base::hash_map<uint32_t, uint32_t> resource_to_texture_id_map_;
-  mojo::Binding<mus::mojom::SurfaceClient> surface_client_binding_;
 
   DISALLOW_COPY_AND_ASSIGN(BitmapUploader);
 };