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

Unified Diff: mojo/application_manager/background_shell_application_loader_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/background_shell_application_loader_unittest.cc
diff --git a/mojo/application_manager/background_shell_application_loader_unittest.cc b/mojo/application_manager/background_shell_application_loader_unittest.cc
index ae9eae9ef0bf4a52e1f151766f0c943dd9be8132..b783a720687f164a50dc5911f4e485caf2645a2e 100644
--- a/mojo/application_manager/background_shell_application_loader_unittest.cc
+++ b/mojo/application_manager/background_shell_application_loader_unittest.cc
@@ -18,7 +18,8 @@ class DummyLoader : public ApplicationLoader {
// ApplicationLoader overrides:
void Load(ApplicationManager* manager,
const GURL& url,
- scoped_refptr<LoadCallbacks> callbacks) override {
+ ScopedMessagePipeHandle shell_handle,
+ LoadCallback callback) override {
if (simulate_app_quit_)
base::MessageLoop::current()->Quit();
}
@@ -48,9 +49,8 @@ TEST(BackgroundShellApplicationLoaderTest, Load) {
BackgroundShellApplicationLoader loader(
real_loader.Pass(), "test", base::MessageLoop::TYPE_DEFAULT);
MessagePipe dummy;
- scoped_refptr<ApplicationLoader::SimpleLoadCallbacks> callbacks(
- new ApplicationLoader::SimpleLoadCallbacks(dummy.handle0.Pass()));
- loader.Load(NULL, GURL(), callbacks);
+ loader.Load(NULL, GURL(), dummy.handle0.Pass(),
+ ApplicationLoader::SimpleLoadCallback());
}
} // namespace mojo

Powered by Google App Engine
This is Rietveld 408576698