mojo/shell/shell_test_helper.cc - Issue 397733003: mojo: kill app_thread before unloading main app library and add tests

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_helper.cc

Issue 397733003: mojo: kill app_thread before unloading main app library and add tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: also service_manager_unittests Created 6 years, 5 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_helper.cc

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

index f79e512faf9a26478c86d7d91eb620b3b35a8ba4..37f8ed2e6ca871be00b76a4e5d9e9f11bacdce13 100644

--- a/mojo/shell/shell_test_helper.cc

+++ b/mojo/shell/shell_test_helper.cc

@@ -28,8 +28,8 @@ void ShellTestHelper::Init() {

test_api_.reset(new ServiceManager::TestAPI(context_->service_manager()));

base::FilePath service_dir;

CHECK(PathService::Get(base::DIR_MODULE, &service_dir));

- context_->mojo_url_resolver()->set_origin(

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

+ context_->mojo_url_resolver()->SetBaseURL(

+ net::FilePathToFileURL(service_dir));

}

void ShellTestHelper::SetLoaderForURL(scoped_ptr<ServiceLoader> loader,

« no previous file with comments | « mojo/shell/shell_test_base_unittest.cc ('k') | no next file » | no next file with comments »