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

Unified Diff: mojo/shell/shell_test_base.cc

Issue 491443005: Get rid of KeepAlive. Quit shell when all urls run directly by Context are closed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleanup 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
« no previous file with comments | « mojo/shell/shell_test_base.h ('k') | mojo/shell/shell_test_base_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/shell_test_base.cc
diff --git a/mojo/shell/shell_test_base.cc b/mojo/shell/shell_test_base.cc
index da643a0d00ec2f2eb2323ffffcdb03800685436c..febf4bd1e17024cb2160a1583c4813f207c219ef 100644
--- a/mojo/shell/shell_test_base.cc
+++ b/mojo/shell/shell_test_base.cc
@@ -33,17 +33,6 @@ void ShellTestBase::SetUp() {
test_server_->ServeFilesFromDirectory(service_dir);
}
-ScopedMessagePipeHandle ShellTestBase::ConnectToServiceViaNetwork(
- const GURL& application_url,
- const std::string& service_name) {
- shell_context_.mojo_url_resolver()->SetBaseURL(
- test_server_->base_url());
tim (not reviewing) 2014/08/22 22:24:21 This was the key to using NetworkService rather th
DaveMoore 2014/08/22 22:48:35 Whoops. I changed that accidentally. It's back now
-
- return shell_context_.application_manager()
- ->ConnectToServiceByName(application_url, service_name)
- .Pass();
-}
-
ScopedMessagePipeHandle ShellTestBase::ConnectToService(
const GURL& application_url,
const std::string& service_name) {
@@ -56,9 +45,8 @@ ScopedMessagePipeHandle ShellTestBase::ConnectToService(
shell_context_.mojo_url_resolver()->SetBaseURL(
net::FilePathToFileURL(service_dir));
- return shell_context_.application_manager()
- ->ConnectToServiceByName(application_url, service_name)
- .Pass();
+ return shell_context_.ConnectToServiceByName(
+ application_url, service_name).Pass();
}
} // namespace test
« no previous file with comments | « mojo/shell/shell_test_base.h ('k') | mojo/shell/shell_test_base_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698