Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(930)

Unified Diff: mojo/shell/application_manager_unittest.cc

Issue 1244233002: Allow trusted brokers to restrict connections for spawned applications to whitelisted applications … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/shell/application_manager_unittest.cc
diff --git a/mojo/shell/application_manager_unittest.cc b/mojo/shell/application_manager_unittest.cc
index 9ae86c0c68719095c852deef2f19c2a889702530..131b88489ad92f1a3767e9e38e213fb2417fabb1 100644
--- a/mojo/shell/application_manager_unittest.cc
+++ b/mojo/shell/application_manager_unittest.cc
@@ -759,7 +759,7 @@ TEST_F(ApplicationManagerTest, TestEndApplicationClosure) {
mojo::URLRequestPtr request(mojo::URLRequest::New());
request->url = mojo::String::From("test:test");
application_manager_->ConnectToApplication(
- request.Pass(), std::string(), GURL(), nullptr, nullptr,
+ NULL, request.Pass(), std::string(), GURL(), nullptr, nullptr, nullptr,
base::Bind(&QuitClosure, base::Unretained(&called)));
loop_.Run();
EXPECT_TRUE(called);
@@ -786,8 +786,8 @@ TEST(ApplicationManagerTest2, ContentHandlerConnectionGetsRequestorURL) {
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)));
+ NULL, request.Pass(), std::string(), requestor_url, nullptr, nullptr,
+ nullptr, base::Bind(&QuitClosure, base::Unretained(&called)));
loop.Run();
EXPECT_TRUE(called);

Powered by Google App Engine
This is Rietveld 408576698