Android: Allow compiling browser without Java UI

chrome/browser/sync/chrome_sync_client.cc

Index: chrome/browser/sync/chrome_sync_client.cc
diff --git a/chrome/browser/sync/chrome_sync_client.cc b/chrome/browser/sync/chrome_sync_client.cc
index 7c5e70d2f98918326012301e7f62da61a321db0c..441bae9768b7c5b7e84a7ddd4748b2e47712a119 100644
--- a/chrome/browser/sync/chrome_sync_client.cc
+++ b/chrome/browser/sync/chrome_sync_client.cc
@@ -90,7 +90,7 @@
 #include "chrome/browser/spellchecker/spellcheck_service.h"
 #endif
 
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
 #include "chrome/browser/sync/glue/synced_window_delegates_getter_android.h"
 #endif
 
@@ -116,7 +116,7 @@ class SyncSessionsClientImpl : public sync_sessions::SyncSessionsClient {
  public:
   explicit SyncSessionsClientImpl(Profile* profile) : profile_(profile) {
     window_delegates_getter_.reset(
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
         // Android doesn't have multi-profile support, so no need to pass the
         // profile in.
         new browser_sync::SyncedWindowDelegatesGetterAndroid());
@@ -262,11 +262,11 @@ base::Closure ChromeSyncClient::GetPasswordStateChangedCallback() {
 sync_driver::SyncApiComponentFactory::RegisterDataTypesMethod
 ChromeSyncClient::GetRegisterPlatformTypesCallback() {
   return base::Bind(
-#ifdef OS_ANDROID
+#ifdef ANDROID_JAVA_UI
       &ChromeSyncClient::RegisterAndroidDataTypes,
 #else
       &ChromeSyncClient::RegisterDesktopDataTypes,
-#endif  // OS_ANDROID
+#endif  // ANDROID_JAVA_UI
       weak_ptr_factory_.GetWeakPtr());
 }