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..cf215b3fc178008af2534936af3d6f3df171a760 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"
@@ -159,10 +160,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;