De-Client Surface interface

examples/ganesh_app/texture_uploader.cc

Index: examples/ganesh_app/texture_uploader.cc
diff --git a/examples/ganesh_app/texture_uploader.cc b/examples/ganesh_app/texture_uploader.cc
index 67a9d05bbff0bc7c28278ac6a7fabd60470c52d7..ce957d511b6d86e1a306d36ad65c6234eae90ea8 100644
--- a/examples/ganesh_app/texture_uploader.cc
+++ b/examples/ganesh_app/texture_uploader.cc
@@ -30,6 +30,7 @@ TextureUploader::TextureUploader(Client* client,
       next_resource_id_(0u),
       id_namespace_(0u),
       local_id_(0u),
+      returner_binding_(this),
       weak_factory_(this) {
   context_->AddObserver(this);
 
@@ -38,7 +39,11 @@ TextureUploader::TextureUploader(Client* client,
                               mojo::GetProxy(&surfaces_service_provider),
                               nullptr);
   mojo::ConnectToService(surfaces_service_provider.get(), &surface_);
-  surface_.set_client(this);
+  surface_->GetIdNamespace(
+      base::Bind(&TextureUploader::SetIdNamespace, base::Unretained(this)));
+  mojo::ResourceReturnerPtr returner_ptr;
+  returner_binding_.Bind(GetProxy(&returner_ptr));
+  surface_->SetResourceReturner(returner_ptr.Pass());
 }
 
 TextureUploader::~TextureUploader() {
@@ -154,8 +159,6 @@ void TextureUploader::SetIdNamespace(uint32_t id_namespace) {
 
 void TextureUploader::ReturnResources(
     mojo::Array<mojo::ReturnedResourcePtr> resources) {
-  if (!resources.size())
-    return;
   context_->MakeCurrent();
   for (size_t i = 0u; i < resources.size(); ++i) {
     mojo::ReturnedResourcePtr resource = resources[i].Pass();