Final step of the java_cpp_template -> java_cpp_enum migration.

chrome/browser/sync/profile_sync_service_android.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/profile_sync_service_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/i18n/time_formatting.h"
@@ skipping 25 matching lines @@
 
 using base::android::AttachCurrentThread;
 using base::android::CheckException;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ScopedJavaLocalRef;
 using content::BrowserThread;
 
 namespace {
 
-enum {
-#define DEFINE_MODEL_TYPE_SELECTION(name,value)  name = value,
-#include "chrome/browser/sync/profile_sync_service_model_type_selection_android.h"
-#undef DEFINE_MODEL_TYPE_SELECTION
+// This enum contains the list of sync ModelTypes that Android can register for
+// invalidations for.
+//
+// A Java counterpart will be generated for this enum.
+// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.sync
+enum ModelTypeSelection {
+  AUTOFILL = 1 << 0,

[Yaron, 2014/10/15 02:36:49]

Did you check that this actually worked? Can you add a test for it? (i.e. an
expression for the enum value)

[mkosiba (inactive), 2014/10/16 12:45:07]

The generated files don't differ (the template mechanism also resulted in Java
constants of the format:

  public static final int DEVICE_INFO = 1<<11;

I added the test.

+  BOOKMARK = 1 << 1,
+  PASSWORD = 1 << 2,
+  SESSION = 1 << 3,
+  TYPED_URL = 1 << 4,
+  AUTOFILL_PROFILE = 1 << 5,
+  HISTORY_DELETE_DIRECTIVE = 1 << 6,
+  PROXY_TABS = 1 << 7,
+  FAVICON_IMAGE = 1 << 8,
+  FAVICON_TRACKING = 1 << 9,
+  NIGORI = 1 << 10,
+  DEVICE_INFO = 1 << 11,
+  EXPERIMENTS = 1 << 12,
+  SUPERVISED_USER_SETTING = 1 << 13,
 };
 
 }  // namespace
 
 ProfileSyncServiceAndroid::ProfileSyncServiceAndroid(JNIEnv* env, jobject obj)
     : profile_(NULL),
       sync_service_(NULL),
       weak_java_profile_sync_service_(env, obj) {
   if (g_browser_process == NULL ||
       g_browser_process->profile_manager() == NULL) {
@@ skipping 428 matching lines @@
   ProfileSyncServiceAndroid* profile_sync_service_android =
       new ProfileSyncServiceAndroid(env, obj);
   profile_sync_service_android->Init();
   return reinterpret_cast<intptr_t>(profile_sync_service_android);
 }
 
 // static
 bool ProfileSyncServiceAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }