Android: Allow compiling browser without Java UI

chrome/browser/io_thread.h

Index: chrome/browser/io_thread.h
diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
index f57bc395a0eb16e6b0e6966ac96c5461a152ea8d..826d7b11c861596b96a7af994bfb8e1a1ef68342 100644
--- a/chrome/browser/io_thread.h
+++ b/chrome/browser/io_thread.h
@@ -36,13 +36,13 @@ namespace base {
 class CommandLine;
 }
 
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
 namespace chrome {
 namespace android {
 class ExternalDataUseObserver;
 }
 }
-#endif  // defined(OS_ANDROID)
+#endif  // defined(ANDROID_JAVA_UI)
 
 namespace chrome_browser_net {
 class DnsProbeService;
@@ -266,11 +266,11 @@ class IOThread : public content::BrowserThreadDelegate {
   // a result of a field trial or a command line flag.
   static bool ShouldEnableQuicForDataReductionProxy();
 
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
 chrome::android::ExternalDataUseObserver* external_data_use_observer() const {
   return external_data_use_observer_.get();
 }
-#endif  // defined(OS_ANDROID)
+#endif  // defined(ANDROID_JAVA_UI)
 
  private:
   // Map from name to value for all parameters associate with a field trial.
@@ -536,10 +536,10 @@ chrome::android::ExternalDataUseObserver* external_data_use_observer() const {
   // |system_network_delegate|.
   scoped_ptr<data_usage::DataUseAggregator> data_use_aggregator_;
   // An external observer of data use.
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
   scoped_ptr<chrome::android::ExternalDataUseObserver>
       external_data_use_observer_;
-#endif  // defined(OS_ANDROID)
+#endif  // defined(ANDROID_JAVA_UI)
 
   const base::TimeTicks creation_time_;