Nukes change_ids from view manager

mojo/services/view_manager/root_node_manager.cc

Index: mojo/services/view_manager/root_node_manager.cc
diff --git a/mojo/services/view_manager/root_node_manager.cc b/mojo/services/view_manager/root_node_manager.cc
index 1b19bf5a047203f7f302da871cfe5cca42cd2312..fe608e822fe27411cc13b40d83343c9a4f01060e 100644
--- a/mojo/services/view_manager/root_node_manager.cc
+++ b/mojo/services/view_manager/root_node_manager.cc
@@ -20,11 +20,9 @@ namespace service {
 RootNodeManager::ScopedChange::ScopedChange(
     ViewManagerServiceImpl* connection,
     RootNodeManager* root,
-    RootNodeManager::ChangeType change_type,
     bool is_delete_node)
     : root_(root),
       connection_id_(connection->id()),
-      change_type_(change_type),
       is_delete_node_(is_delete_node) {
   root_->PrepareForChange(this);
 }
@@ -33,10 +31,6 @@ RootNodeManager::ScopedChange::~ScopedChange() {
   root_->FinishChange();
 }
 
-void RootNodeManager::ScopedChange::SendServerChangeIdAdvanced() {
-  root_->SendServerChangeIdAdvanced();
-}
-
 RootNodeManager::Context::Context() {
   // Pass in false as native viewport creates the PlatformEventSource.
   aura::Env::CreateInstance(false);
@@ -52,7 +46,6 @@ RootNodeManager::RootNodeManager(
     const Callback<void()>& native_viewport_closed_callback)
     : app_connection_(app_connection),
       next_connection_id_(1),
-      next_server_change_id_(1),
       root_view_manager_(app_connection,
                          this,
                          view_manager_delegate,
@@ -184,8 +177,7 @@ void RootNodeManager::ProcessNodeHierarchyChanged(const Node* node,
   for (ConnectionMap::iterator i = connection_map_.begin();
        i != connection_map_.end(); ++i) {
     i->second->ProcessNodeHierarchyChanged(
-        node, new_parent, old_parent, next_server_change_id_,
-        IsChangeSource(i->first));
+        node, new_parent, old_parent, IsChangeSource(i->first));
   }
 }
 
@@ -195,8 +187,7 @@ void RootNodeManager::ProcessNodeReorder(const Node* node,
   for (ConnectionMap::iterator i = connection_map_.begin();
        i != connection_map_.end(); ++i) {
     i->second->ProcessNodeReorder(
-        node, relative_node, direction, next_server_change_id_,
-        IsChangeSource(i->first));
+        node, relative_node, direction, IsChangeSource(i->first));
   }
 }
 
@@ -213,8 +204,7 @@ void RootNodeManager::ProcessNodeViewReplaced(const Node* node,
 void RootNodeManager::ProcessNodeDeleted(const NodeId& node) {
   for (ConnectionMap::iterator i = connection_map_.begin();
        i != connection_map_.end(); ++i) {
-    i->second->ProcessNodeDeleted(node, next_server_change_id_,
-                                  IsChangeSource(i->first));
+    i->second->ProcessNodeDeleted(node, IsChangeSource(i->first));
   }
 }
 
@@ -245,20 +235,9 @@ void RootNodeManager::PrepareForChange(ScopedChange* change) {
 void RootNodeManager::FinishChange() {
   // PrepareForChange/FinishChange should be balanced.
   CHECK(current_change_);
-  if (current_change_->change_type() == CHANGE_TYPE_ADVANCE_SERVER_CHANGE_ID)
-    next_server_change_id_++;
   current_change_ = NULL;
 }
 
-void RootNodeManager::SendServerChangeIdAdvanced() {
-  CHECK(current_change_);
-  for (ConnectionMap::iterator i = connection_map_.begin();
-       i != connection_map_.end(); ++i) {
-    if (!DidConnectionMessageClient(i->first))
-      i->second->client()->OnServerChangeIdAdvanced(next_server_change_id_ + 1);
-  }
-}
-
 ViewManagerServiceImpl* RootNodeManager::EmbedImpl(
     const ConnectionSpecificId creator_id,
     const String& url,