Mandoline: Introduce ApplicationConnection::CloseConnection

mojo/application/public/cpp/lib/application_impl.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/application/public/cpp/application_impl.h"
 
+#include <algorithm>
+
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/application/public/cpp/application_delegate.h"
 #include "mojo/application/public/cpp/lib/service_registry.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
 #include "mojo/public/cpp/environment/logging.h"
 
 namespace mojo {
 
 namespace {
@@ skipping 53 matching lines @@
       this, application_url, application_url, remote_services.Pass(),
       local_request.Pass());
   if (!delegate_->ConfigureOutgoingConnection(registry)) {
     delete registry;
     return nullptr;
   }
   outgoing_service_registries_.push_back(registry);
   return registry;
 }
 
+void ApplicationImpl::CloseConnection(ApplicationConnection* connection) {
+  auto it = std::find(outgoing_service_registries_.begin(),
+                      outgoing_service_registries_.end(),
+                      connection);
+  DCHECK(it != outgoing_service_registries_.end());
+  delete *it;

[sky, 2015/06/19 19:22:19]

IMO I would erase first, then delete. That way you don't have to worry about
side effects to the underlying vector.

[Fady Samuel, 2015/06/26 22:41:20]

Done.

+  outgoing_service_registries_.erase(it);

[sky, 2015/06/19 19:22:19]

Can't this be used for incoming connections too?

[Fady Samuel, 2015/06/26 22:41:20]

Done.

+}
+
 void ApplicationImpl::Initialize(ShellPtr shell, const mojo::String& url) {
   shell_ = shell.Pass();
   shell_.set_error_handler(this);
   url_ = url;
   delegate_->Initialize(this);
 }
 
 void ApplicationImpl::WaitForInitialize() {
   if (!shell_)
     binding_.WaitForIncomingMethodCall();
@@ skipping 52 matching lines @@
 
 void ApplicationImpl::OnConnectionError() {
   base::WeakPtr<ApplicationImpl> ptr(weak_factory_.GetWeakPtr());
   QuitNow();
   if (!ptr)
     return;
   shell_ = nullptr;
 }
 
 }  // namespace mojo