Internalize ServiceConnector<>

mojo/services/view_manager/view_manager_connection.cc

Index: mojo/services/view_manager/view_manager_connection.cc
diff --git a/mojo/services/view_manager/view_manager_connection.cc b/mojo/services/view_manager/view_manager_connection.cc
index 6ea756fbc4a75cd6a7f69c58d9c3719d4722b761..402625c9c4d55328d815dea544e1cc6abbace63c 100644
--- a/mojo/services/view_manager/view_manager_connection.cc
+++ b/mojo/services/view_manager/view_manager_connection.cc
@@ -59,7 +59,10 @@ void NodeToINode(Node* node,
 
 }  // namespace
 
-ViewManagerConnection::ViewManagerConnection() : client_(NULL), id_(0) {
+ViewManagerConnection::ViewManagerConnection(RootNodeManager* root_node_manager)
+    : root_node_manager_(root_node_manager),
+      client_(NULL),
+      id_(0) {
 }
 
 ViewManagerConnection::~ViewManagerConnection() {
@@ -78,14 +81,17 @@ ViewManagerConnection::~ViewManagerConnection() {
   }
 
   STLDeleteContainerPairSecondPointers(node_map_.begin(), node_map_.end());
-  context()->RemoveConnection(this);
+  root_node_manager_->RemoveConnection(this);
 }
 
+void ViewManagerConnection::OnConnectionError() {}
+
 void ViewManagerConnection::Initialize() {
   DCHECK_EQ(0, id_);  // Should only get Initialize() once.
-  id_ = context()->GetAndAdvanceNextConnectionId();
-  context()->AddConnection(this);
-  client_->OnConnectionEstablished(id_, context()->next_server_change_id());
+  id_ = root_node_manager_->GetAndAdvanceNextConnectionId();
+  root_node_manager_->AddConnection(this);
+  client_->OnConnectionEstablished(id_,
+                                   root_node_manager_->next_server_change_id());
 }
 
 Node* ViewManagerConnection::GetNode(const NodeId& id) {
@@ -93,7 +99,7 @@ Node* ViewManagerConnection::GetNode(const NodeId& id) {
     NodeMap::iterator i = node_map_.find(id.node_id);
     return i == node_map_.end() ? NULL : i->second;
   }
-  return context()->GetNode(id);
+  return root_node_manager_->GetNode(id);
 }
 
 View* ViewManagerConnection::GetView(const ViewId& id) {
@@ -101,7 +107,7 @@ View* ViewManagerConnection::GetView(const ViewId& id) {
     ViewMap::const_iterator i = view_map_.find(id.view_id);
     return i == view_map_.end() ? NULL : i->second;
   }
-  return context()->GetView(id);
+  return root_node_manager_->GetView(id);
 }
 
 void ViewManagerConnection::NotifyNodeHierarchyChanged(
@@ -144,7 +150,7 @@ bool ViewManagerConnection::DeleteNodeImpl(ViewManagerConnection* source,
   if (!node)
     return false;
   RootNodeManager::ScopedChange change(
-      source, context(), change_id,
+      source, root_node_manager_, change_id,
       RootNodeManager::CHANGE_TYPE_ADVANCE_SERVER_CHANGE_ID);
   if (node->GetParent())
     node->GetParent()->Remove(node);
@@ -155,7 +161,7 @@ bool ViewManagerConnection::DeleteNodeImpl(ViewManagerConnection* source,
   node_map_.erase(node_id.node_id);
   delete node;
   node = NULL;
-  context()->NotifyNodeDeleted(node_id);
+  root_node_manager_->NotifyNodeDeleted(node_id);
   return true;
 }
 
@@ -167,7 +173,7 @@ bool ViewManagerConnection::DeleteViewImpl(ViewManagerConnection* source,
   if (!view)
     return false;
   RootNodeManager::ScopedChange change(
-      source, context(), change_id,
+      source, root_node_manager_, change_id,
       RootNodeManager::CHANGE_TYPE_DONT_ADVANCE_SERVER_CHANGE_ID);
   if (view->node())
     view->node()->SetView(NULL);
@@ -186,7 +192,7 @@ bool ViewManagerConnection::SetViewImpl(const NodeId& node_id,
   if (!view && view_id != ViewId())
     return false;
   RootNodeManager::ScopedChange change(
-      this, context(), change_id,
+      this, root_node_manager_, change_id,
       RootNodeManager::CHANGE_TYPE_DONT_ADVANCE_SERVER_CHANGE_ID);
   node->SetView(view);
   return true;
@@ -213,7 +219,7 @@ void ViewManagerConnection::DeleteNode(
     TransportChangeId change_id,
     const Callback<void(bool)>& callback) {
   const NodeId node_id(NodeIdFromTransportId(transport_node_id));
-  ViewManagerConnection* connection = context()->GetConnection(
+  ViewManagerConnection* connection = root_node_manager_->GetConnection(
       node_id.connection_id);
   callback.Run(connection &&
                connection->DeleteNodeImpl(this, node_id, change_id));
@@ -226,14 +232,14 @@ void ViewManagerConnection::AddNode(
     TransportChangeId client_change_id,
     const Callback<void(bool)>& callback) {
   bool success = false;
-  if (server_change_id == context()->next_server_change_id()) {
+  if (server_change_id == root_node_manager_->next_server_change_id()) {
     Node* parent = GetNode(NodeIdFromTransportId(parent_id));
     Node* child = GetNode(NodeIdFromTransportId(child_id));
     if (parent && child && child->GetParent() != parent &&
         !child->window()->Contains(parent->window())) {
       success = true;
       RootNodeManager::ScopedChange change(
-          this, context(), client_change_id,
+          this, root_node_manager_, client_change_id,
           RootNodeManager::CHANGE_TYPE_ADVANCE_SERVER_CHANGE_ID);
       parent->Add(child);
     }
@@ -247,12 +253,12 @@ void ViewManagerConnection::RemoveNodeFromParent(
     TransportChangeId client_change_id,
     const Callback<void(bool)>& callback) {
   bool success = false;
-  if (server_change_id == context()->next_server_change_id()) {
+  if (server_change_id == root_node_manager_->next_server_change_id()) {
     Node* node = GetNode(NodeIdFromTransportId(node_id));
     if (node && node->GetParent()) {
       success = true;
       RootNodeManager::ScopedChange change(
-          this, context(), client_change_id,
+          this, root_node_manager_, client_change_id,
           RootNodeManager::CHANGE_TYPE_ADVANCE_SERVER_CHANGE_ID);
       node->GetParent()->Remove(node);
     }
@@ -289,7 +295,7 @@ void ViewManagerConnection::DeleteView(
     TransportChangeId change_id,
     const Callback<void(bool)>& callback) {
   const ViewId view_id(ViewIdFromTransportId(transport_view_id));
-  ViewManagerConnection* connection = context()->GetConnection(
+  ViewManagerConnection* connection = root_node_manager_->GetConnection(
       view_id.connection_id);
   callback.Run(connection &&
                connection->DeleteViewImpl(this, view_id, change_id));
@@ -327,13 +333,13 @@ void ViewManagerConnection::SetViewContents(
 void ViewManagerConnection::OnNodeHierarchyChanged(const NodeId& node,
                                                    const NodeId& new_parent,
                                                    const NodeId& old_parent) {
-  context()->NotifyNodeHierarchyChanged(node, new_parent, old_parent);
+  root_node_manager_->NotifyNodeHierarchyChanged(node, new_parent, old_parent);
 }
 
 void ViewManagerConnection::OnNodeViewReplaced(const NodeId& node,
                                                const ViewId& new_view_id,
                                                const ViewId& old_view_id) {
-  context()->NotifyNodeViewReplaced(node, new_view_id, old_view_id);
+  root_node_manager_->NotifyNodeViewReplaced(node, new_view_id, old_view_id);
 }
 
 }  // namespace view_manager