Convert view manager to surfaces with uploading shim in client lib

mojo/services/view_manager/connection_manager.cc

Index: mojo/services/view_manager/connection_manager.cc
diff --git a/mojo/services/view_manager/connection_manager.cc b/mojo/services/view_manager/connection_manager.cc
index bc1f21db0bfc989cebf896ac4db3e60ec11fe1e9..d6b7958344d54f7cfd1d61b51215f98c19a0bf15 100644
--- a/mojo/services/view_manager/connection_manager.cc
+++ b/mojo/services/view_manager/connection_manager.cc
@@ -9,7 +9,6 @@
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
 #include "mojo/services/public/cpp/input_events/input_events_type_converters.h"
 #include "mojo/services/view_manager/view_manager_service_impl.h"
-#include "ui/aura/env.h"
 
 namespace mojo {
 namespace service {
@@ -28,27 +27,17 @@ ConnectionManager::ScopedChange::~ScopedChange() {
   connection_manager_->FinishChange();
 }
 
-ConnectionManager::Context::Context() {
-  // Pass in false as native viewport creates the PlatformEventSource.
-  aura::Env::CreateInstance(false);
-}
-
-ConnectionManager::Context::~Context() {
-  aura::Env::DeleteInstance();
-}
-
 ConnectionManager::ConnectionManager(
     ApplicationConnection* app_connection,
-    DisplayManagerDelegate* display_manager_delegate,
     const Callback<void()>& native_viewport_closed_callback)
     : app_connection_(app_connection),
       next_connection_id_(1),
       display_manager_(app_connection,
                        this,
-                       display_manager_delegate,
                        native_viewport_closed_callback),
       root_(new ServerView(this, RootViewId())),
       current_change_(NULL) {
+  root_->SetBounds(gfx::Rect(800, 600));

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

Can we move this to the native viewport service? The native viewport service
should be the one imposing the initial size. Especially important for devices
where we want fullscreen.

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

The way NVS works today is the client picks the size that the native viewport is
set to initially, so we have to pick.

Setting the root's bounds here is pretty weird.  I'll see if it can be better

 }
 
 ConnectionManager::~ConnectionManager() {
@@ -269,7 +258,7 @@ void ConnectionManager::OnViewBoundsChanged(const ServerView* view,
   display_manager_.SchedulePaint(view->parent(), new_bounds);
 }
 
-void ConnectionManager::OnViewBitmapChanged(const ServerView* view) {
+void ConnectionManager::OnViewSurfaceChanged(const ServerView* view) {
   display_manager_.SchedulePaint(view, gfx::Rect(view->bounds().size()));
 }