2 files changed, 5 insertions, 8 deletions
diff --git a/mojo/cc/output_surface_mojo.cc b/mojo/cc/output_surface_mojo.cc
index fff1380..c489280 100644
--- a/mojo/cc/output_surface_mojo.cc
+++ b/mojo/cc/output_surface_mojo.cc
@@ -4,6 +4,7 @@
 
 #include "mojo/cc/output_surface_mojo.h"
 
+#include "base/bind.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/output_surface_client.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
@@ -20,6 +21,8 @@ OutputSurfaceMojo::OutputSurfaceMojo(
       surface_(surface.Pass()),
       id_namespace_(0u),
       local_id_(0u) {
+  surface_->GetIdNamespace(
+      base::Bind(&OutputSurfaceMojo::SetIdNamespace, base::Unretained(this)));
   capabilities_.delegated_rendering = true;
   capabilities_.max_frames_pending = 1;
 }
@@ -36,11 +39,7 @@ void OutputSurfaceMojo::SetIdNamespace(uint32_t id_namespace) {
   }
 }
 
-void OutputSurfaceMojo::ReturnResources(Array<ReturnedResourcePtr> resources) {
-}
-
 bool OutputSurfaceMojo::BindToClient(cc::OutputSurfaceClient* client) {
-  surface_.set_client(this);
   return cc::OutputSurface::BindToClient(client);
 }
 
diff --git a/mojo/cc/output_surface_mojo.h b/mojo/cc/output_surface_mojo.h
index a34193e..48c4dbe 100644
--- a/mojo/cc/output_surface_mojo.h
+++ b/mojo/cc/output_surface_mojo.h
@@ -19,7 +19,7 @@ class OutputSurfaceMojoClient {
   virtual void DidCreateSurface(cc::SurfaceId id) = 0;
 };
 
-class OutputSurfaceMojo : public cc::OutputSurface, public SurfaceClient {
+class OutputSurfaceMojo : public cc::OutputSurface {
  public:
   OutputSurfaceMojo(OutputSurfaceMojoClient* client,
                     const scoped_refptr<cc::ContextProvider>& context_provider,
@@ -33,9 +33,7 @@ class OutputSurfaceMojo : public cc::OutputSurface, public SurfaceClient {
   ~OutputSurfaceMojo() override;
 
  private:
-  // SurfaceClient implementation.
-  void SetIdNamespace(uint32_t id_namespace) override;
-  void ReturnResources(Array<ReturnedResourcePtr> resources) override;
+  void SetIdNamespace(uint32_t id_namespace);
 
   OutputSurfaceMojoClient* output_surface_mojo_client_;
   SurfacePtr surface_;