Android: Allow compiling browser without Java UI

chrome/browser/download/download_resource_throttle_unittest.cc

Index: chrome/browser/download/download_resource_throttle_unittest.cc
diff --git a/chrome/browser/download/download_resource_throttle_unittest.cc b/chrome/browser/download/download_resource_throttle_unittest.cc
index 20ac74d7c6085d57679200aef375310a25695ed6..086ead3b4f10a7198475b214b8375513eef05884 100644
--- a/chrome/browser/download/download_resource_throttle_unittest.cc
+++ b/chrome/browser/download/download_resource_throttle_unittest.cc
@@ -17,7 +17,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
 #include "chrome/browser/android/download/mock_download_controller_android.h"
 #endif
 
@@ -61,7 +61,7 @@ class DownloadResourceThrottleTest : public ChromeRenderViewHostTestHarness {
     ChromeRenderViewHostTestHarness::SetUp();
     web_contents()->SetDelegate(&delegate_);
     run_loop_.reset(new base::RunLoop());
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
     content::DownloadControllerAndroid::SetDownloadControllerAndroid(
         &download_controller_);
 #endif
@@ -70,7 +70,7 @@ class DownloadResourceThrottleTest : public ChromeRenderViewHostTestHarness {
   void TearDown() override {
     content::BrowserThread::DeleteSoon(content::BrowserThread::IO, FROM_HERE,
                                        throttle_);
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
     content::DownloadControllerAndroid::SetDownloadControllerAndroid(nullptr);
 #endif
     ChromeRenderViewHostTestHarness::TearDown();
@@ -101,7 +101,7 @@ class DownloadResourceThrottleTest : public ChromeRenderViewHostTestHarness {
   scoped_refptr<DownloadRequestLimiter> limiter_;
   ::testing::NiceMock<MockResourceController> resource_controller_;
   scoped_ptr<base::RunLoop> run_loop_;
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
   chrome::android::MockDownloadControllerAndroid download_controller_;
 #endif
 };
@@ -112,7 +112,7 @@ TEST_F(DownloadResourceThrottleTest, StartDownloadThrottle_Basic) {
   StartThrottle();
 }
 
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
 TEST_F(DownloadResourceThrottleTest, DownloadWithFailedFileAcecssRequest) {
   content::DownloadControllerAndroid::Get()
       ->SetApproveFileAccessRequestForTesting(false);