More viewmanager renaming:

mojo/services/view_manager/view_manager_init_service_context.cc

Index: mojo/services/view_manager/view_manager_init_service_context.cc
diff --git a/mojo/services/view_manager/view_manager_init_service_context.cc b/mojo/services/view_manager/view_manager_init_service_context.cc
index 5e63bb865f588ed44caf13726cb2d572bdfe1cfb..99e40fca15ea056a3ca280f596038d47b5dfa1c3 100644
--- a/mojo/services/view_manager/view_manager_init_service_context.cc
+++ b/mojo/services/view_manager/view_manager_init_service_context.cc
@@ -6,7 +6,7 @@
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
-#include "mojo/services/view_manager/root_node_manager.h"
+#include "mojo/services/view_manager/connection_manager.h"
 #include "mojo/services/view_manager/view_manager_init_service_impl.h"
 
 namespace mojo {
@@ -38,16 +38,16 @@ void ViewManagerInitServiceContext::RemoveConnection(
   }
 
   // This object is owned by an object that outlives the current thread's
-  // message loop, so we need to destroy the RootNodeManager earlier, as it may
-  // attempt to post tasks during its destruction.
+  // message loop, so we need to destroy the ConnectionManager earlier, as it
+  // may attempt to post tasks during its destruction.
   if (connections_.empty())
-    root_node_manager_.reset();
+    connection_manager_.reset();
 }
 
 void ViewManagerInitServiceContext::ConfigureIncomingConnection(
     ApplicationConnection* connection) {
-  if (!root_node_manager_.get()) {
-    root_node_manager_.reset(new RootNodeManager(
+  if (!connection_manager_.get()) {
+    connection_manager_.reset(new ConnectionManager(
         connection,
         this,
         base::Bind(&ViewManagerInitServiceContext::OnNativeViewportDeleted,
@@ -82,7 +82,7 @@ void ViewManagerInitServiceContext::OnNativeViewportDeleted() {
     delete *it;
   }
   connections_.clear();
-  root_node_manager_.reset();
+  connection_manager_.reset();
 }
 
 void ViewManagerInitServiceContext::MaybeEmbed() {
@@ -91,7 +91,7 @@ void ViewManagerInitServiceContext::MaybeEmbed() {
 
   for (ScopedVector<ConnectParams>::const_iterator it = connect_params_.begin();
        it != connect_params_.end(); ++it) {
-    root_node_manager_->EmbedRoot((*it)->url, (*it)->service_provider.Pass());
+    connection_manager_->EmbedRoot((*it)->url, (*it)->service_provider.Pass());
     (*it)->callback.Run(true);
   }
   connect_params_.clear();