Minor cleanup of ViewManagerServiceImpl

mojo/services/view_manager/connection_manager.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/connection_manager.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
@@ skipping 121 matching lines @@
   std::string creator_url;
   ConnectionMap::const_iterator it = connection_map_.find(creator_id);
   if (it != connection_map_.end())
     creator_url = it->second->url();
 
   ViewManagerServiceImpl* connection =
       new ViewManagerServiceImpl(this,
                                  creator_id,
                                  creator_url,
                                  url.To<std::string>(),
-                                 ViewIdFromTransportId(transport_view_id),
-                                 service_provider.Pass());
+                                 ViewIdFromTransportId(transport_view_id));
   AddConnection(connection);
   WeakBindToPipe(connection, pipe.handle0.Pass());
+  connection->Init(service_provider.Pass());
   OnConnectionMessagedClient(connection->id());
 }
 
 ViewManagerServiceImpl* ConnectionManager::GetConnection(
     ConnectionSpecificId connection_id) {
   ConnectionMap::iterator i = connection_map_.find(connection_id);
   return i == connection_map_.end() ? NULL : i->second;
 }
 
 ServerView* ConnectionManager::GetView(const ViewId& id) {
@@ skipping 199 matching lines @@
   if (window_manager_vm_service_) {
     VLOG(1) << "ViewManager interface requested more than once.";
     return;
   }
 
   window_manager_vm_service_ =
       new ViewManagerServiceImpl(this,
                                  kInvalidConnectionId,
                                  std::string(),
                                  std::string("mojo:window_manager"),
-                                 RootViewId(),
-                                 InterfaceRequest<ServiceProvider>());
+                                 RootViewId());
   AddConnection(window_manager_vm_service_);
   WeakBindToRequest(window_manager_vm_service_, &request);
+  window_manager_vm_service_->Init(InterfaceRequest<ServiceProvider>());
 }
 
 void ConnectionManager::Create(
     ApplicationConnection* connection,
     InterfaceRequest<WindowManagerInternalClient> request) {
   if (wm_internal_client_impl_.get()) {
     VLOG(1) << "WindowManagerInternalClient requested more than once.";
     return;
   }
 
   wm_internal_client_impl_.reset(
       new WindowManagerInternalClientImpl(this, this));
   WeakBindToRequest(wm_internal_client_impl_.get(), &request);
 }
 
 void ConnectionManager::OnConnectionError() {
   delegate_->OnLostConnectionToWindowManager();
 }
 
 }  // namespace service
 }  // namespace mojo