mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc - Issue 298653010: Change Shell / ShellClient to ServiceProvider

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/services/public/cpp/view_manager/tests/view_manager_unittest.cc

Issue 298653010: Change Shell / ShellClient to ServiceProvider (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Support content Mojo stuff Created 6 years, 7 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

« mojo/public/interfaces/service_provider/service_provider.mojom ('K') | « mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc ('k') | mojo/services/public/cpp/view_manager/view_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc

diff --git a/mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc b/mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc

index d28dca2c13d5f0f5fef66e9dd7ce432a3a241e97..d1cbb2f8884f93d0fadb3badcb124f8920644686 100644

--- a/mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc

+++ b/mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc

@@ -246,8 +246,8 @@ class ViewManagerTest : public testing::Test {

// Overridden from testing::Test:

virtual void SetUp() OVERRIDE {

test_helper_.Init();

- view_manager_1_.reset(new ViewManager(test_helper_.shell()));

- view_manager_2_.reset(new ViewManager(test_helper_.shell()));

+ view_manager_1_.reset(new ViewManager(test_helper_.service_provider()));

+ view_manager_2_.reset(new ViewManager(test_helper_.service_provider()));

view_manager_1_->Init();

view_manager_2_->Init();

}