mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.cc - Issue 698883005: Update mojo sdk to rev cfc99316100efdfa7d53d83f9e07f1d4d3765c21

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/lib/view_manager_test_suite.cc

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

Patch Set: Created 6 years, 1 month 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/services/public/cpp/view_manager/lib/view_manager_client_impl.cc ('k') | mojo/services/public/interfaces/clipboard/clipboard.mojom » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.cc

diff --git a/mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.cc b/mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.cc

index abe0906e4e42a365e65d73fb7999e9de9f8ae037..b5912ec249c3f97008cc1ed055902a3056151ad0 100644

--- a/mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.cc

+++ b/mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.cc

@@ -5,7 +5,6 @@

#include "mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.h"

#include "base/i18n/icu_util.h"

-#include "ui/gl/gl_surface.h"

#if defined(USE_X11)

#include "ui/gfx/x/x11_connection.h"

@@ -26,10 +25,6 @@ void ViewManagerTestSuite::Initialize() {

gfx::InitializeThreadedX11();

#endif

-#if defined(COMPONENT_BUILD)

- gfx::GLSurface::InitializeOneOffForTests();

-#endif

base::TestSuite::Initialize();

// base::TestSuite and ViewsInit both try to load icu. That's ok for tests.