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

Unified Diff: mojo/application_manager/application_manager_unittest.cc

Issue 741453002: Make sure that Content Handled application can be connected multiple times. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Fix sky Created 6 years, 1 month 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/application_manager/application_manager_unittest.cc
diff --git a/mojo/application_manager/application_manager_unittest.cc b/mojo/application_manager/application_manager_unittest.cc
index 4db97064e202e1ceb7a615b10a9509aa8b4413b5..53fcec16503383167d323efedbf9968c71b47b5a 100644
--- a/mojo/application_manager/application_manager_unittest.cc
+++ b/mojo/application_manager/application_manager_unittest.cc
@@ -115,10 +115,10 @@ class TestApplicationLoader : public ApplicationLoader,
// ApplicationLoader implementation.
void Load(ApplicationManager* manager,
const GURL& url,
- scoped_refptr<LoadCallbacks> callbacks) override {
+ ScopedMessagePipeHandle shell_handle,
+ LoadCallback callback) override {
++num_loads_;
- test_app_.reset(
- new ApplicationImpl(this, callbacks->RegisterApplication().Pass()));
+ test_app_.reset(new ApplicationImpl(this, shell_handle.Pass()));
}
void OnApplicationError(ApplicationManager* manager,
@@ -326,9 +326,9 @@ class Tester : public ApplicationDelegate,
private:
void Load(ApplicationManager* manager,
const GURL& url,
- scoped_refptr<LoadCallbacks> callbacks) override {
- app_.reset(
- new ApplicationImpl(this, callbacks->RegisterApplication().Pass()));
+ ScopedMessagePipeHandle shell_handle,
+ LoadCallback callback) override {
+ app_.reset(new ApplicationImpl(this, shell_handle.Pass()));
}
void OnApplicationError(ApplicationManager* manager,
« no previous file with comments | « mojo/application_manager/application_manager.cc ('k') | mojo/application_manager/background_shell_application_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698