base/test/test_suite.cc - Issue 10700158: Get base_unittests closer to compiling for iOS

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: base/test/test_suite.cc

Issue 10700158: Get base_unittests closer to compiling for iOS (Closed) Base URL: http://git.chromium.org/chromium/src.git@all-ios-tweak

Patch Set: Comment fix Created 8 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: base/test/test_suite.cc

diff --git a/base/test/test_suite.cc b/base/test/test_suite.cc

index 0a34ec3d7aaad1c814322b3b2acfec644e0a5b94..0cca8fa25ba9093f87e6af7ebfdb66cc583acdcd 100644

--- a/base/test/test_suite.cc

+++ b/base/test/test_suite.cc

@@ -25,8 +25,10 @@

#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 // !OS_IOS

+#endif // OS_MACOSX

#if defined(OS_ANDROID)

#include "base/test/test_support_android.h"

@@ -291,7 +293,7 @@ void TestSuite::SuppressErrorDialogs() {

}

void TestSuite::Initialize() {

-#if defined(OS_MACOSX)

+#if defined(OS_MACOSX) && !defined(OS_IOS)

// Some of the app unit tests spin runloops.

mock_cr_app::RegisterMockCrApp();

#endif

« base/base.gyp ('K') | « base/base.gyp ('k') | no next file » | no next file with comments »