mojo/shell/shell_test_base.cc - Issue 323593002: Mojo: Use network service to load non-local Mojo Apps.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: mojo/shell/shell_test_base.cc

Issue 323593002: Mojo: Use network service to load non-local Mojo Apps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase 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:

Index: mojo/shell/shell_test_base.cc

diff --git a/mojo/shell/shell_test_base.cc b/mojo/shell/shell_test_base.cc

index ebe3405169fa5d1e2b456e8cbe2606b851a517ff..b4f0e4b646ab8c396b79006399a8e639d62df479 100644

--- a/mojo/shell/shell_test_base.cc

+++ b/mojo/shell/shell_test_base.cc

@@ -46,7 +46,8 @@ void ShellTestBase::LaunchServiceInProcess(

// On Linux, they're under lib/.

base::FilePath service_dir(base_dir.AppendASCII("lib"));

#endif

- shell_context_->set_mojo_origin(net::FilePathToFileURL(service_dir).spec());

+ shell_context_->mojo_url_resolver()->set_origin(

+ net::FilePathToFileURL(service_dir).spec());

shell_context_->service_manager()->ConnectToService(

service_url, service_name, client_handle.Pass(), GURL());

« no previous file with comments | « mojo/shell/run.cc ('k') | mojo/shell/storage.h » ('j') | no next file with comments »