Convert view manager to surfaces with uploading shim in client lib

mojo/services/view_manager/connection_manager.h

Index: mojo/services/view_manager/connection_manager.h
diff --git a/mojo/services/view_manager/connection_manager.h b/mojo/services/view_manager/connection_manager.h
index c3996a611afb627173e486e9fcd6e21e34938286..a751097c0a29d19f3802469b58965f1e4752f3a1 100644
--- a/mojo/services/view_manager/connection_manager.h
+++ b/mojo/services/view_manager/connection_manager.h
@@ -26,7 +26,6 @@ class ApplicationConnection;
 
 namespace service {
 
-class DisplayManagerDelegate;
 class ViewManagerServiceImpl;
 
 // ConnectionManager manages the set of connections to the ViewManager (all the
@@ -67,7 +66,6 @@ class MOJO_VIEW_MANAGER_EXPORT ConnectionManager : public ServerViewDelegate {
   };
 
   ConnectionManager(ApplicationConnection* app_connection,
-                    DisplayManagerDelegate* display_manager_delegate,
                     const Callback<void()>& native_viewport_closed_callback);
   virtual ~ConnectionManager();
 
@@ -138,12 +136,6 @@ class MOJO_VIEW_MANAGER_EXPORT ConnectionManager : public ServerViewDelegate {
   void ProcessViewDeleted(const ViewId& view);
 
  private:
-  // Used to setup any static state needed by ConnectionManager.
-  struct Context {
-    Context();
-    ~Context();
-  };
-
   typedef std::map<ConnectionSpecificId, ViewManagerServiceImpl*> ConnectionMap;
 
   // Invoked when a connection is about to make a change.  Subsequently followed
@@ -177,9 +169,7 @@ class MOJO_VIEW_MANAGER_EXPORT ConnectionManager : public ServerViewDelegate {
   virtual void OnViewBoundsChanged(const ServerView* view,
                                    const gfx::Rect& old_bounds,
                                    const gfx::Rect& new_bounds) OVERRIDE;
-  virtual void OnViewBitmapChanged(const ServerView* view) OVERRIDE;
-
-  Context context_;
+  virtual void OnViewSurfaceChanged(const ServerView* view) OVERRIDE;
 
   ApplicationConnection* app_connection_;