Final step of the java_cpp_template -> java_cpp_enum migration.

components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkId.java

Index: components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkId.java
diff --git a/components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkId.java b/components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkId.java
index 88764febbbe5b6ab3aa7f50696aacf34e74094d3..d8caa2888262f3697ef9d8948578a718bb985156 100644
--- a/components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkId.java
+++ b/components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkId.java
@@ -34,9 +34,9 @@ public class BookmarkId {
     private static int getBookmarkTypeFromChar(char c) {
         switch (c) {
             case TYPE_PARTNER:
-                return BookmarkType.BOOKMARK_TYPE_PARTNER;
+                return BookmarkType.PARTNER;
             default:
-                return BookmarkType.BOOKMARK_TYPE_NORMAL;
+                return BookmarkType.NORMAL;
         }
     }
 
@@ -55,7 +55,7 @@ public class BookmarkId {
      */
     public static BookmarkId getBookmarkIdFromString(String s) {
         long id = ROOT_FOLDER_ID;
-        int type = BookmarkType.BOOKMARK_TYPE_NORMAL;
+        int type = BookmarkType.NORMAL;
         if (TextUtils.isEmpty(s))
             return new BookmarkId(id, type);
         char folderTypeChar = s.charAt(0);
@@ -89,9 +89,9 @@ public class BookmarkId {
 
     private String getBookmarkTypeString() {
         switch (mType) {
-            case BookmarkType.BOOKMARK_TYPE_PARTNER:
+            case BookmarkType.PARTNER:
                 return String.valueOf(TYPE_PARTNER);
-            case BookmarkType.BOOKMARK_TYPE_NORMAL:
+            case BookmarkType.NORMAL:
             default:
                 return "";
         }