third_party/mojo/src/mojo/public/cpp/application/lib/application_test_base.cc - Issue 954643002: Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819

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: third_party/mojo/src/mojo/public/cpp/application/lib/application_test_base.cc

Issue 954643002: Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: use run_renderer_in_process() Created 5 years, 10 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 | « third_party/mojo/src/mojo/public/cpp/application/lib/application_impl.cc ('k') | third_party/mojo/src/mojo/public/cpp/bindings/binding.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/mojo/src/mojo/public/cpp/application/lib/application_test_base.cc

diff --git a/third_party/mojo/src/mojo/public/cpp/application/lib/application_test_base.cc b/third_party/mojo/src/mojo/public/cpp/application/lib/application_test_base.cc

index ba6dd3f0ca0e7ae7d6357b3d62f1729e34ad5282..d4e002f74ffcc66de774d7c8ccbe4085e0115463 100644

--- a/third_party/mojo/src/mojo/public/cpp/application/lib/application_test_base.cc

+++ b/third_party/mojo/src/mojo/public/cpp/application/lib/application_test_base.cc

@@ -47,7 +47,9 @@ class ShellAndArgumentGrabber : public Application {

private:

// Application implementation.

- void Initialize(ShellPtr shell, Array<String> args) override {

+ void Initialize(ShellPtr shell,

+ Array<String> args,

+ const mojo::String& url) override {

*args_ = args.Pass();

g_application_request = binding_.Unbind();

g_shell = shell.Pass();

@@ -137,7 +139,7 @@ void ApplicationTestBase::SetUp() {

g_application_request.Pass());

// Fake application initialization with the given command line arguments.

- application_impl_->Initialize(g_shell.Pass(), g_args.Clone());

+ application_impl_->Initialize(g_shell.Pass(), g_args.Clone(), "");

}

void ApplicationTestBase::TearDown() {