Android: Allow compiling browser without Java UI

chrome/browser/io_thread.cc

Index: chrome/browser/io_thread.cc
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 35ed57e46105cec561116b820744ba8a09afa885..5cb39103c56fe55fbbaee986d2b365b372cae0a2 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -112,8 +112,7 @@
 #include "net/cert_net/nss_ocsp.h"
 #endif
 
-#if defined(OS_ANDROID)
-#include "base/android/build_info.h"
+#if defined(ANDROID_JAVA_UI)
 #include "chrome/browser/android/data_usage/external_data_use_observer.h"
 #include "chrome/browser/android/net/external_estimate_provider_android.h"
 #include "components/data_usage/android/traffic_stats_amortizer.h"
@@ -609,7 +608,7 @@ void IOThread::Init() {
 #endif
 
   scoped_ptr<data_usage::DataUseAmortizer> data_use_amortizer;
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
   data_use_amortizer.reset(new data_usage::android::TrafficStatsAmortizer());
 #endif
 
@@ -630,7 +629,7 @@ void IOThread::Init() {
   chrome_network_delegate->set_data_use_aggregator(
       data_use_aggregator(), true /* is_data_usage_off_the_record */);
 
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
   external_data_use_observer_.reset(
       new chrome::android::ExternalDataUseObserver(
           data_use_aggregator(),
@@ -651,7 +650,7 @@ void IOThread::Init() {
                                  &network_quality_estimator_params);
 
   scoped_ptr<net::ExternalEstimateProvider> external_estimate_provider;
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
   external_estimate_provider.reset(
       new chrome::android::ExternalEstimateProviderAndroid());
 #endif