Allow trusted brokers to restrict connections for spawned applications to whitelisted applications …

mojo/shell/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 "base/at_exit.h"
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/application/public/cpp/application_connection.h"
@@ skipping 741 matching lines @@
 
 TEST_F(ApplicationManagerTest, TestEndApplicationClosure) {
   ClosingApplicationLoader* loader = new ClosingApplicationLoader();
   application_manager_->SetLoaderForScheme(
       scoped_ptr<ApplicationLoader>(loader), "test");
 
   bool called = false;
   mojo::URLRequestPtr request(mojo::URLRequest::New());
   request->url = mojo::String::From("test:test");
   application_manager_->ConnectToApplication(
-      request.Pass(), std::string(), GURL(), nullptr, nullptr,
+      nullptr, request.Pass(), std::string(), GURL(), nullptr, nullptr, nullptr,
       base::Bind(&QuitClosure, base::Unretained(&called)));
   loop_.Run();
   EXPECT_TRUE(called);
 }
 
 TEST(ApplicationManagerTest2, ContentHandlerConnectionGetsRequestorURL) {
   const GURL content_handler_url("http://test.content.handler");
   const GURL requestor_url("http://requestor.url");
   TestContext test_context;
   base::MessageLoop loop;
   TestDelegate test_delegate;
   test_delegate.set_create_test_fetcher(true);
   ApplicationManager application_manager(&test_delegate);
   application_manager.set_default_loader(nullptr);
   application_manager.RegisterContentHandler(kTestMimeType,
                                              content_handler_url);
 
   TestApplicationLoader* loader = new TestApplicationLoader;
   loader->set_context(&test_context);
   application_manager.SetLoaderForURL(scoped_ptr<ApplicationLoader>(loader),
                                       content_handler_url);
 
   bool called = false;
   mojo::URLRequestPtr request(mojo::URLRequest::New());
   request->url = mojo::String::From("test:test");
   application_manager.ConnectToApplication(
-      request.Pass(), std::string(), requestor_url, nullptr, nullptr,
-      base::Bind(&QuitClosure, base::Unretained(&called)));
+      nullptr, request.Pass(), std::string(), requestor_url, nullptr, nullptr,
+      nullptr, base::Bind(&QuitClosure, base::Unretained(&called)));
   loop.Run();
   EXPECT_TRUE(called);
 
   ASSERT_EQ(1, loader->num_loads());
   EXPECT_EQ(requestor_url, loader->last_requestor_url());
 }
 
 }  // namespace
 }  // namespace shell
 }  // namespace mojo