chrome/test/base/chrome_test_suite.cc - Issue 1459793002: Android: Allow compiling browser without Java UI

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

Issue 1459793002: Android: Allow compiling browser without Java UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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:

Index: chrome/test/base/chrome_test_suite.cc

diff --git a/chrome/test/base/chrome_test_suite.cc b/chrome/test/base/chrome_test_suite.cc

index 6581d13d17539c087194a452fba2e140aabd774b..83d522fffd53d55dfd991acd753ae35d631bcd13 100644

--- a/chrome/test/base/chrome_test_suite.cc

+++ b/chrome/test/base/chrome_test_suite.cc

@@ -22,7 +22,7 @@

#include "extensions/common/constants.h"

#include "testing/gtest/include/gtest/gtest.h"

-#if defined(OS_ANDROID)

+#if defined(ANDROID_JAVA_UI)

#include "base/android/jni_android.h"

#include "chrome/browser/android/chrome_jni_registrar.h"

#endif

@@ -82,7 +82,7 @@ void ChromeTestSuite::Initialize() {

PathService::Override(base::DIR_MODULE, browser_dir_);

}

-#if defined(OS_ANDROID)

+#if defined(ANDROID_JAVA_UI)

ASSERT_TRUE(chrome::android::RegisterBrowserJNI(

base::android::AttachCurrentThread()));

#endif