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

Unified Diff: mojo/shell/shell_test_base.cc

Issue 349303006: mojo: add some end-to-end shell tests and a new test sample app (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: no icu Created 6 years, 6 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 53747beb5f194a9f07af07f2a3c26a58db357ad6..d80b454686fa615716a1d8161842b8fd23bd0a67 100644
--- a/mojo/shell/shell_test_base.cc
+++ b/mojo/shell/shell_test_base.cc
@@ -23,8 +23,8 @@ ShellTestBase::ShellTestBase() {
ShellTestBase::~ShellTestBase() {
}
-ScopedMessagePipeHandle ShellTestBase::LaunchServiceInProcess(
- const GURL& service_url,
+ScopedMessagePipeHandle ShellTestBase::ConnectToService(
+ const GURL& application_url,
const std::string& service_name) {
base::FilePath base_dir;
CHECK(PathService::Get(base::DIR_EXE, &base_dir));
@@ -42,7 +42,7 @@ ScopedMessagePipeHandle ShellTestBase::LaunchServiceInProcess(
net::FilePathToFileURL(service_dir).spec());
return shell_context_.service_manager()->ConnectToServiceByName(
- service_url, service_name).Pass();
+ 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