content/test/content_test_suite.cc - Issue 656293003: [Mac] Do not initialize the MockCrApplication in base::TestSuite.

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: content/test/content_test_suite.cc

Issue 656293003: [Mac] Do not initialize the MockCrApplication in base::TestSuite. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Ready for review Created 6 years, 2 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

Index: content/test/content_test_suite.cc

diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc

index 4b7083ab21bcb50dd2d3703bfecf1353a10f0217..24bad08a5ca80336c1e1b8689f78096c25eb7993 100644

--- a/content/test/content_test_suite.cc

+++ b/content/test/content_test_suite.cc

@@ -18,6 +18,9 @@

#if defined(OS_MACOSX)

#include "base/mac/scoped_nsautorelease_pool.h"

+#if !defined(OS_IOS)

+#include "base/test/mock_chrome_application_mac.h"

+#endif

#endif

#if !defined(OS_IOS)

@@ -63,6 +66,9 @@ ContentTestSuite::~ContentTestSuite() {

void ContentTestSuite::Initialize() {

#if defined(OS_MACOSX)

base::mac::ScopedNSAutoreleasePool autorelease_pool;

+#if !defined(OS_IOS)

+ mock_cr_app::RegisterMockCrApp();

+#endif

#endif

#if defined(OS_WIN)

« base/mac/scoped_sending_event_unittest.mm ('K') | « base/test/test_suite.cc ('k') | ui/app_list/test/run_all_unittests.cc » ('j') | ui/app_list/test/run_all_unittests.cc » ('J')