Split surface id and simplify connecting to surfaces service

examples/bitmap_uploader/bitmap_uploader.cc

Index: examples/bitmap_uploader/bitmap_uploader.cc
diff --git a/examples/bitmap_uploader/bitmap_uploader.cc b/examples/bitmap_uploader/bitmap_uploader.cc
index 86e3bc219f0df984959280c82bf10423f02e5e4b..07becf6c7a03b2d8c6cf5edeac94fd493a176967 100644
--- a/examples/bitmap_uploader/bitmap_uploader.cc
+++ b/examples/bitmap_uploader/bitmap_uploader.cc
@@ -103,10 +103,10 @@ void BitmapUploader::Upload() {
       surface_->DestroySurface(surface_id_.Clone());
     } else {
       surface_id_ = SurfaceId::New();
-      surface_id_->id = static_cast<uint64_t>(id_namespace_) << 32;
+      surface_id_->id_namespace = id_namespace_;
     }
-    surface_id_->id++;
-    surface_->CreateSurface(surface_id_.Clone(), size.Clone());
+    surface_id_->local++;
+    surface_->CreateSurface(surface_id_.Clone());
     view_->SetSurfaceId(surface_id_.Clone());
     surface_size_ = size;
   }
@@ -225,6 +225,9 @@ void BitmapUploader::Upload() {
   surface_->SubmitFrame(surface_id_.Clone(), frame.Pass(), mojo::Closure());
 }
 
+void BitmapUploader::SetIdNamespace(uint32_t id_namespace) {
+}
+
 void BitmapUploader::ReturnResources(Array<ReturnedResourcePtr> resources) {
   if (!resources.size())
     return;