Use local ids for Surfaces APIs that can only apply to local surfaces

examples/surfaces_app/child_impl.h

 // 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.
 
 #ifndef EXAMPLES_SURFACES_APP_CHILD_IMPL_H_
 #define EXAMPLES_SURFACES_APP_CHILD_IMPL_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 22 matching lines @@
  public:
   class Context {
    public:
     virtual ApplicationConnection* ShellConnection(
         const mojo::String& application_url) = 0;
   };
   explicit ChildImpl(ApplicationConnection* surfaces_service_connection);
   ~ChildImpl() override;
 
  private:
+  using ProduceCallback = mojo::Callback<void(SurfaceIdPtr id)>;
+
   // SurfaceClient implementation
   void SetIdNamespace(uint32_t id_namespace) override;
   void ReturnResources(Array<ReturnedResourcePtr> resources) override;
 
   // Child implementation.
-  void ProduceFrame(
-      ColorPtr color,
-      SizePtr size,
-      const mojo::Callback<void(SurfaceIdPtr id)>& callback) override;
+  void ProduceFrame(ColorPtr color,
+                    SizePtr size,
+                    const ProduceCallback& callback) override;
 
   scoped_ptr<cc::SurfaceIdAllocator> allocator_;
   SurfacePtr surface_;
-  cc::SurfaceId id_;
+  uint32_t id_namespace_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildImpl);
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 #endif  // EXAMPLES_SURFACES_APP_CHILD_IMPL_H_