Split surface id and simplify connecting to surfaces service

sky/compositor/surface_holder.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sky/compositor/surface_holder.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/public/cpp/application/connect.h"
@@ skipping 33 matching lines @@
 void SurfaceHolder::SetSize(const gfx::Size& size) {
   if (surface_id_ && size_ == size)
     return;
 
   if (surface_id_) {
     surface_->DestroySurface(surface_id_.Clone());
   } else {
     surface_id_ = mojo::SurfaceId::New();
   }
 
-  surface_id_->id = surface_allocator_->CreateSurfaceId();
-  surface_->CreateSurface(surface_id_.Clone(), mojo::Size::From(size));
+  surface_id_ = surface_allocator_->CreateSurfaceId();
+  surface_->CreateSurface(surface_id_.Clone());
   size_ = size;
 
   client_->OnSurfaceIdAvailable(surface_id_.Clone());
 }
 
+void SurfaceHolder::SetIdNamespace(uint32_t id_namespace) {
+}
+
 void SurfaceHolder::ReturnResources(
     mojo::Array<mojo::ReturnedResourcePtr> resources) {
   // TODO(abarth): The surface service shouldn't spam us with empty calls.
   if (!resources.size())
     return;
   client_->ReturnResources(resources.Pass());
 }
 
 void SurfaceHolder::OnSurfaceConnectionCreated(mojo::SurfacePtr surface,
                                                uint32_t id_namespace) {
   surface_ = surface.Pass();
   surface_.set_client(this);
   surface_allocator_.reset(new SurfaceAllocator(id_namespace));
   client_->OnSurfaceConnectionCreated();
 }
 
 }  // namespace sky