Final step of the java_cpp_template -> java_cpp_enum migration.

chrome/browser/android/activity_type_ids.h

Index: chrome/browser/android/activity_type_ids.h
diff --git a/chrome/browser/android/activity_type_ids.h b/chrome/browser/android/activity_type_ids.h
index 606f8759519b596cddfa6a33e8807a8c43cb4f5d..eb478db8c26c3d99d0b6a5db3bb8e8eea3beb5ad 100644
--- a/chrome/browser/android/activity_type_ids.h
+++ b/chrome/browser/android/activity_type_ids.h
@@ -9,11 +9,25 @@
 
 namespace ActivityTypeIds {
 
+// Define Activities we are interested in tracking.  IDs are assigned
+// consecutively, from NONE to MAX_VALUE.  Activities that are not explicitly
+// defined are all assigned the UNKNOWN value.  When adding new ones, make sure
+// to append them after current Activities and to update the |AndroidActivityId|
+// enum in |histograms.xml|.
+//
+// A Java counterpart will be generated for this enum.
+// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser
+// GENERATED_JAVA_CLASS_NAME_OVERRIDE: ActivityTypeIds
+// GENERATED_JAVA_PREFIX_TO_STRIP: ACTIVITY_
 enum Type {
-#define DEFINE_ACTIVITY_ID(id,value) ACTIVITY_##id = (value),
-#include "activity_type_id_list.h"
-#undef DEFINE_ACTIVITY_ID
-};  // enum Type
+  ACTIVITY_NONE = 0,
+  ACTIVITY_UNKNOWN = 1,
+  ACTIVITY_MAIN = 2,
+  ACTIVITY_PREFERENCES = 3,
+  ACTIVITY_WEBAPPACTIVITY = 4,
+  ACTIVITY_FULLSCREENACTIVITY = 5,
+  ACTIVITY_MAX_VALUE = 6
+};
 
 // Takes an int corresponding to a Type and returns the corresponding Type.
 Type GetActivityType(int type_id);