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

Unified Diff: trunk/src/mojo/service_manager/service_manager_unittest.cc

Issue 443063003: Revert 287680 "mojo: terminate apps if the shell goes away" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 4 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: trunk/src/mojo/service_manager/service_manager_unittest.cc
===================================================================
--- trunk/src/mojo/service_manager/service_manager_unittest.cc (revision 287751)
+++ trunk/src/mojo/service_manager/service_manager_unittest.cc (working copy)
@@ -618,8 +618,15 @@
}
TEST_F(ServiceManagerTest, NoServiceNoLoad) {
- AddLoaderForURL(GURL(kTestAURLString), std::string());
+ // Because we'll never successfully connect to anything here and apps are not
+ // capable of noticing zero incoming connections and quitting, we need to use
+ // a quittable loader.
+ scoped_ptr<BackgroundShellServiceLoader> loader(MakeLoader(std::string()));
+ loader->set_quit_on_shutdown();
+ service_manager_->SetLoaderForURL(loader.PassAs<ServiceLoader>(),
+ GURL(kTestAURLString));
+
// There is no TestC service implementation registered with ServiceManager,
// so this cannot succeed (but also shouldn't crash).
TestCPtr c;

Powered by Google App Engine
This is Rietveld 408576698