Pass application ids via AcceptConnection & ConnectToApplication callback.

mojo/shell/package_manager/content_handler_unittest.cc

 // Copyright 2015 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 <stdint.h>
 
 #include <utility>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
@@ skipping 207 matching lines @@
       scoped_ptr<ApplicationLoader>(content_handler_loader),
       content_handler_url_);
 
   uint32_t content_handler_id;
   {
     base::RunLoop run_loop;
     scoped_ptr<ConnectToApplicationParams> params(
         new ConnectToApplicationParams);
     params->set_source(Identity(requestor_url_));
     params->SetTargetURL(GURL("test:test"));
-    params->set_connect_callback([&content_handler_id, &run_loop](uint32_t t) {
+    params->set_connect_callback(
+        [&content_handler_id, &run_loop](uint32_t, uint32_t t) {
       content_handler_id = t;
       run_loop.Quit();
     });
     application_manager_->ConnectToApplication(std::move(params));
     run_loop.Run();
-    EXPECT_NE(Shell::kInvalidContentHandlerID, content_handler_id);
+    EXPECT_NE(Shell::kInvalidApplicationID, content_handler_id);
   }
 
   uint32_t content_handler_id2;
   {
     base::RunLoop run_loop;
     scoped_ptr<ConnectToApplicationParams> params(
         new ConnectToApplicationParams);
     params->set_source(Identity(requestor_url_));
     params->SetTargetURL(GURL("test:test"));
-    params->set_connect_callback([&content_handler_id2, &run_loop](uint32_t t) {
+    params->set_connect_callback(
+        [&content_handler_id2, &run_loop](uint32_t, uint32_t t) {
       content_handler_id2 = t;
       run_loop.Quit();
     });
     application_manager_->ConnectToApplication(std::move(params));
     run_loop.Run();
-    EXPECT_NE(Shell::kInvalidContentHandlerID, content_handler_id2);
+    EXPECT_NE(Shell::kInvalidApplicationID, content_handler_id2);
   }
   EXPECT_EQ(content_handler_id, content_handler_id2);
 }
 
 TEST_F(ContentHandlerTest, DifferedContentHandlersGetDifferentIDs) {
   TestApplicationLoader* content_handler_loader = new TestApplicationLoader;
   application_manager_->SetLoaderForURL(
       scoped_ptr<ApplicationLoader>(content_handler_loader),
       content_handler_url_);
 
   uint32_t content_handler_id;
   {
     base::RunLoop run_loop;
     scoped_ptr<ConnectToApplicationParams> params(
         new ConnectToApplicationParams);
     params->set_source(Identity(requestor_url_));
     params->SetTargetURL(GURL("test:test"));
-    params->set_connect_callback([&content_handler_id, &run_loop](uint32_t t) {
+    params->set_connect_callback(
+        [&content_handler_id, &run_loop](uint32_t, uint32_t t) {
       content_handler_id = t;
       run_loop.Quit();
     });
     application_manager_->ConnectToApplication(std::move(params));
     run_loop.Run();
-    EXPECT_NE(Shell::kInvalidContentHandlerID, content_handler_id);
+    EXPECT_NE(Shell::kInvalidApplicationID, content_handler_id);
   }
 
   const std::string mime_type2 = "test/mime-type2";
   const GURL content_handler_url2("http://test.content.handler2");
   test_package_manager_->set_mime_type(mime_type2);
   test_package_manager_->RegisterContentHandler(mime_type2,
                                                 content_handler_url2);
 
   TestApplicationLoader* content_handler_loader2 = new TestApplicationLoader;
   application_manager_->SetLoaderForURL(
       scoped_ptr<ApplicationLoader>(content_handler_loader2),
       content_handler_url2);
 
   uint32_t content_handler_id2;
   {
     base::RunLoop run_loop;
     scoped_ptr<ConnectToApplicationParams> params(
         new ConnectToApplicationParams);
     params->set_source(Identity(requestor_url_));
     params->SetTargetURL(GURL("test2:test2"));
-    params->set_connect_callback([&content_handler_id2, &run_loop](uint32_t t) {
+    params->set_connect_callback(
+        [&content_handler_id2, &run_loop](uint32_t, uint32_t t) {
       content_handler_id2 = t;
       run_loop.Quit();
     });
     application_manager_->ConnectToApplication(std::move(params));
     run_loop.Run();
-    EXPECT_NE(Shell::kInvalidContentHandlerID, content_handler_id2);
+    EXPECT_NE(Shell::kInvalidApplicationID, content_handler_id2);
   }
   EXPECT_NE(content_handler_id, content_handler_id2);
 }
 
 TEST_F(ContentHandlerTest,
        ConnectWithNoContentHandlerGetsInvalidContentHandlerId) {
   application_manager_->SetLoaderForURL(
       scoped_ptr<ApplicationLoader>(new TestApplicationLoader),
       GURL("test:test"));
 
   uint32_t content_handler_id = 1u;
   scoped_ptr<ConnectToApplicationParams> params(
       new ConnectToApplicationParams);
   params->SetTargetURL(GURL("test:test"));
   params->set_connect_callback(
-      [&content_handler_id](uint32_t t) { content_handler_id = t; });
+      [&content_handler_id](uint32_t, uint32_t t) { content_handler_id = t; });
   application_manager_->ConnectToApplication(std::move(params));
   EXPECT_EQ(0u, content_handler_id);
 }
 
 }  // namespace test
 }  // namespace package_manager
 }  // namespace mojo