| 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 e2e7570623c7c46eff160ef4a3d23490ff9de306..1cd0c076d0cef90c86249024e352a994fc262ef7 100644
|
| --- a/chrome/test/base/chrome_test_suite.cc
|
| +++ b/chrome/test/base/chrome_test_suite.cc
|
| @@ -17,7 +17,6 @@
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/common/chrome_constants.h"
|
| #include "chrome/common/chrome_paths.h"
|
| -#include "chrome/common/features.h"
|
| #include "chrome/common/url_constants.h"
|
| #include "components/content_settings/core/common/content_settings_pattern.h"
|
| #include "content/public/test/test_launcher.h"
|
| @@ -25,7 +24,7 @@
|
| #include "media/base/media.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| #include "base/android/jni_android.h"
|
| #include "chrome/browser/android/chrome_jni_registrar.h"
|
| #endif
|
| @@ -77,7 +76,7 @@ void ChromeTestSuite::Initialize() {
|
| PathService::Override(base::DIR_MODULE, browser_dir_);
|
| }
|
|
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| ASSERT_TRUE(
|
| android::RegisterBrowserJNI(base::android::AttachCurrentThread()));
|
| #endif
|
|
|