Convert view manager to surfaces with uploading shim in client lib

mojo/services/view_manager/view_manager_service_impl.h

Index: mojo/services/view_manager/view_manager_service_impl.h
diff --git a/mojo/services/view_manager/view_manager_service_impl.h b/mojo/services/view_manager/view_manager_service_impl.h
index e805387efc89249c3c92f7cb584522ec1b39fe6b..cc9789174cf9892a8d0ea6608165890a56400b50 100644
--- a/mojo/services/view_manager/view_manager_service_impl.h
+++ b/mojo/services/view_manager/view_manager_service_impl.h
@@ -13,6 +13,7 @@
 #include "base/compiler_specific.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
+#include "mojo/services/public/interfaces/surfaces/surface_id.mojom.h"
 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
 #include "mojo/services/view_manager/access_policy_delegate.h"
 #include "mojo/services/view_manager/ids.h"
@@ -23,6 +24,7 @@ class Rect;
 }
 
 namespace mojo {
+

[sky, 2014/09/03 22:45:28]

nit: nuke.

[jamesr, 2014/09/03 23:32:47]

Done.

 namespace service {
 
 class AccessPolicy;
@@ -159,10 +161,9 @@ class MOJO_VIEW_MANAGER_EXPORT ViewManagerServiceImpl
   virtual void GetViewTree(
       Id view_id,
       const Callback<void(Array<ViewDataPtr>)>& callback) OVERRIDE;
-  virtual void SetViewContents(Id view_id,
-                               ScopedSharedBufferHandle buffer,
-                               uint32_t buffer_size,
-                               const Callback<void(bool)>& callback) OVERRIDE;
+  virtual void SetViewSurfaceId(Id view_id,
+                                SurfaceIdPtr surface_id,
+                                const Callback<void(bool)>& callback) OVERRIDE;
   virtual void SetViewBounds(Id view_id,
                              RectPtr bounds,
                              const Callback<void(bool)>& callback) OVERRIDE;