7/ Eliminate on_application_end from ConnectParams

mojo/shell/tests/application_manager_unittest.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/shell/application_manager.h"
 
 #include <utility>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
@@ skipping 19 matching lines @@
 const char kTestAURLString[] = "test:TestA";
 const char kTestBURLString[] = "test:TestB";
 
 struct TestContext {
   TestContext() : num_impls(0), num_loader_deletes(0) {}
   std::string last_test_string;
   int num_impls;
   int num_loader_deletes;
 };
 
-void QuitClosure(bool* value) {
-  *value = true;
-  base::MessageLoop::current()->QuitWhenIdle();
+void QuitClosure(const Identity& expected,
+                 bool* value,
+                 const Identity& actual) {
+  if (expected == actual) {
+    *value = true;
+    base::MessageLoop::current()->QuitWhenIdle();
+  }
 }
 
 class TestServiceImpl : public TestService {
  public:
   TestServiceImpl(TestContext* context, InterfaceRequest<TestService> request)
       : context_(context), binding_(this, std::move(request)) {
     ++context_->num_impls;
   }
 
   ~TestServiceImpl() override {
@@ skipping 537 matching lines @@
 }
 
 TEST_F(ApplicationManagerTest, TestEndApplicationClosure) {
   ClosingApplicationLoader* loader = new ClosingApplicationLoader();
   application_manager_->SetLoaderForURL(
       scoped_ptr<ApplicationLoader>(loader), GURL("test:test"));
 
   bool called = false;
   scoped_ptr<ConnectParams> params(new ConnectParams);
   params->SetTargetURL(GURL("test:test"));
-  params->set_on_application_end(
-      base::Bind(&QuitClosure, base::Unretained(&called)));
+  application_manager_->SetInstanceQuitCallback(
+      base::Bind(&QuitClosure, params->target(), &called));
   application_manager_->Connect(std::move(params));
   loop_.Run();
   EXPECT_TRUE(called);
 }
 
 TEST_F(ApplicationManagerTest, SameIdentityShouldNotCauseDuplicateLoad) {
   // 1 because ApplicationManagerTest connects once at startup.
   EXPECT_EQ(1, test_loader_->num_loads());
 
   TestServicePtr test_service;
   ConnectToInterface(GURL("test:foo"), &test_service);
   EXPECT_EQ(2, test_loader_->num_loads());
 
   // Exactly the same URL as above.
   ConnectToInterface(GURL("test:foo"), &test_service);
   EXPECT_EQ(2, test_loader_->num_loads());
 
   // A different identity because the domain is different.
   ConnectToInterface(GURL("test:bar"), &test_service);
   EXPECT_EQ(3, test_loader_->num_loads());
 }
 
 }  // namespace test
 }  // namespace shell
 }  // namespace mojo