[sync] Upstream the Android ProfileSyncService

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 6815b87d9a250f970f46297399b930fad9e62c76..7af517bc0cd22ebd46e154484f182b8d9e57f60b 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2083,10 +2083,13 @@
         'browser/sync/profile_sync_components_factory_impl.h',
         'browser/sync/profile_sync_service.cc',
         'browser/sync/profile_sync_service.h',
+        'browser/sync/profile_sync_service_android.cc',
+        'browser/sync/profile_sync_service_android.h',
         'browser/sync/profile_sync_service_factory.cc',
         'browser/sync/profile_sync_service_factory.h',
         'browser/sync/profile_sync_service_harness.cc',
         'browser/sync/profile_sync_service_harness.h',
+        'browser/sync/profile_sync_service_model_type_selection_android.h',
         'browser/sync/retry_verifier.cc',
         'browser/sync/retry_verifier.h',
         'browser/sync/sync_global_error.cc',
@@ -3148,6 +3151,7 @@
             'android/java/src/org/chromium/chrome/browser/NavigationPopup.java',
             'android/java/src/org/chromium/chrome/browser/ProcessUtils.java',
             'android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java',
+            'android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java',
             'android/java/src/org/chromium/chrome/browser/TabBase.java',
             'android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java',
           ],
@@ -3157,6 +3161,18 @@
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
+          'target_name': 'profile_sync_service_model_type_selection_java',
+          'type': 'none',
+          'sources': [
+            'android/java/ModelTypeSelection.template',
+          ],
+          'variables': {
+            'package_name': 'org/chromium/chrome/browser/sync',
+            'template_deps': ['browser/sync/profile_sync_service_model_type_selection_android.h'],
+          },
+          'includes': [ '../build/android/java_cpp_template.gypi' ],
+        },
+        {
           'target_name': 'toolbar_model_security_levels_java',
           'type': 'none',
           'sources': [