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

Unified Diff: mojo/shell/shell_test_base.cc

Issue 346613004: Use loadable module instead of shared library. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Follow review 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/mojo_url_resolver.cc ('k') | no next file » | 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..b2e5dc5134c206a5561cadcf18cef6a25105b87b 100644
--- a/mojo/shell/shell_test_base.cc
+++ b/mojo/shell/shell_test_base.cc
@@ -26,18 +26,8 @@ ShellTestBase::~ShellTestBase() {
ScopedMessagePipeHandle ShellTestBase::LaunchServiceInProcess(
const GURL& service_url,
const std::string& service_name) {
- base::FilePath base_dir;
- CHECK(PathService::Get(base::DIR_EXE, &base_dir));
- // On android, the library is bundled with the app.
-#if defined(OS_ANDROID)
- // On Android, the library is bundled with the app.
base::FilePath service_dir;
CHECK(PathService::Get(base::DIR_MODULE, &service_dir));
-#else
- // On other platforms, "loadable modules" are dumped beside the executables.
- base::FilePath service_dir;
- CHECK(PathService::Get(base::DIR_EXE, &service_dir));
-#endif
shell_context_.mojo_url_resolver()->set_origin(
net::FilePathToFileURL(service_dir).spec());
« no previous file with comments | « mojo/shell/mojo_url_resolver.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698