Revert 266940 "First step at synchronizing client model changes ..."

trunk/src/mojo/services/view_manager/view_manager_connection.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/services/view_manager/view_manager_connection.h"
 
 #include "base/stl_util.h"
 #include "mojo/services/view_manager/node.h"
 #include "mojo/services/view_manager/root_node_manager.h"
 #include "mojo/services/view_manager/view.h"
@@ skipping 21 matching lines @@
   }
 
   STLDeleteContainerPairSecondPointers(node_map_.begin(), node_map_.end());
   context()->RemoveConnection(this);
 }
 
 void ViewManagerConnection::Initialize(
     ServiceConnector<ViewManagerConnection, RootNodeManager>* service_factory,
     ScopedMessagePipeHandle client_handle) {
   DCHECK_EQ(0, id_);  // Should only get Initialize() once.
-  ServiceConnection<IViewManager, ViewManagerConnection, RootNodeManager>::
+  ServiceConnection<ViewManager, ViewManagerConnection, RootNodeManager>::
       Initialize(service_factory, client_handle.Pass());
   id_ = context()->GetAndAdvanceNextConnectionId();
   context()->AddConnection(this);
   client()->OnConnectionEstablished(id_);
 }
 
 Node* ViewManagerConnection::GetNode(const NodeId& id) {
   if (id_ == id.connection_id) {
     NodeMap::iterator i = node_map_.find(id.node_id);
     return i == node_map_.end() ? NULL : i->second;
@@ skipping 169 matching lines @@
 
 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);
 }
 
 }  // namespace view_manager
 }  // namespace services
 }  // namespace mojo