Android: Allow compiling browser without Java UI

chrome/browser/net/chrome_network_delegate.cc

Index: chrome/browser/net/chrome_network_delegate.cc
diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc
index 507ce90fe75dfa9ee85944d36c53162a6f1d597e..5b7cf46ef83c128064817c5dd137710acd1dffe7 100644
--- a/chrome/browser/net/chrome_network_delegate.cc
+++ b/chrome/browser/net/chrome_network_delegate.cc
@@ -56,7 +56,7 @@
 #include "net/log/net_log.h"
 #include "net/url_request/url_request.h"
 
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)

[Ted C, 2015/11/30 19:39:05]

it is really weird to see a UI ifdef in the network delegate.

I think we really need to look at each one of these individually and make sure
this is the right decision (and I certainly am not the one to be able to say in
many cases).

I think this is fine to get something progressing, but I don't really know how
we can make sure we don't forget and let something fall through the cracks.

[no sievers, 2015/11/30 23:56:34]

I debated decorating a lot of this code with TODOs. But I don't think it adds
much. 
I guess I should have explained that my plan was:
1) strip out all Java
2) bring shared/wanted stuff in bit by bit while potentially reorganizing the
code a bit (think deps rules, directory structure, gn/gyp which currently just
specifies one JAVA_IN_DIR)

This works better to unblock people because most of the missing Java code just
breaks (or changes) some specific feature, but we should still be able to build
the main browser.

 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/precache/precache_manager_factory.h"
 #include "components/precache/content/precache_manager.h"
@@ -106,7 +106,7 @@ void ForceGoogleSafeSearchCallbackWrapper(
   callback.Run(rv);
 }
 
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
 void RecordPrecacheStatsOnUIThread(const GURL& url,
                                    const GURL& referrer,
                                    base::TimeDelta latency,
@@ -129,7 +129,7 @@ void RecordPrecacheStatsOnUIThread(const GURL& url,
   precache_manager->RecordStatsForFetch(url, referrer, latency, fetch_time,
                                         size, was_cached);
 }
-#endif  // defined(OS_ANDROID)
+#endif  // defined(ANDROID_JAVA_UI)
 
 void ReportInvalidReferrerSendOnUI() {
   base::RecordAction(
@@ -526,7 +526,7 @@ void ChromeNetworkDelegate::OnCompleted(net::URLRequest* request,
   }
 
   if (request->status().status() == net::URLRequestStatus::SUCCESS) {
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
     // For better accuracy, we use the actual bytes read instead of the length
     // specified with the Content-Length header, which may be inaccurate,
     // or missing, as is the case with chunked encoding.
@@ -540,7 +540,7 @@ void ChromeNetworkDelegate::OnCompleted(net::URLRequest* request,
         base::Bind(&RecordPrecacheStatsOnUIThread, request->url(),
                    GURL(request->referrer()), latency, base::Time::Now(),
                    received_content_length, request->was_cached(), profile_));
-#endif  // defined(OS_ANDROID)
+#endif  // defined(ANDROID_JAVA_UI)
     extensions_delegate_->OnCompleted(request, started);
   } else if (request->status().status() == net::URLRequestStatus::FAILED ||
              request->status().status() == net::URLRequestStatus::CANCELED) {