Final step of the java_cpp_template -> java_cpp_enum migration.

chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.cc

 // Copyright 2014 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/android/enhanced_bookmarks/enhanced_bookmarks_bridge.h"
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/enhanced_bookmarks/chrome_bookmark_server_cluster_service.h"
@@ skipping 25 matching lines @@
   cluster_service_->RemoveObserver(this);
 }
 
 void EnhancedBookmarksBridge::Destroy(JNIEnv*, jobject) {
   delete this;
 }
 
 ScopedJavaLocalRef<jstring> EnhancedBookmarksBridge::GetBookmarkDescription(
     JNIEnv* env, jobject obj, jlong id, jint type) {
   DCHECK(bookmark_model_->loaded());
-  DCHECK_EQ(type, BookmarkType::NORMAL);
+  DCHECK_EQ(type, BookmarkType::BOOKMARK_TYPE_NORMAL);

[Lei Zhang, 2014/10/14 22:52:40]

If you don't mind, flip this around because it's DCHECK_EQ(expected, actual).

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

Done.

 
   const BookmarkNode* node = bookmarks::GetBookmarkNodeByID(
       bookmark_model_, static_cast<int64>(id));
 
   return node ?
           base::android::ConvertUTF8ToJavaString(
               env, enhanced_bookmarks::DescriptionFromBookmark(node)) :
           ScopedJavaLocalRef<jstring>();
 }
 
 void EnhancedBookmarksBridge::SetBookmarkDescription(JNIEnv* env,
                                                      jobject obj,
                                                      jlong id,
                                                      jint type,
                                                      jstring description) {
   DCHECK(bookmark_model_->loaded());
-  DCHECK_EQ(type, BookmarkType::NORMAL);
+  DCHECK_EQ(type, BookmarkType::BOOKMARK_TYPE_NORMAL);
 
   const BookmarkNode* node = bookmarks::GetBookmarkNodeByID(
       bookmark_model_, static_cast<int64>(id));
 
   enhanced_bookmarks::SetDescriptionForBookmark(
       bookmark_model_, node,
       base::android::ConvertJavaStringToUTF8(env, description));
 }
 
 void EnhancedBookmarksBridge::GetBookmarksForFilter(JNIEnv* env,
@@ skipping 35 matching lines @@
   return reinterpret_cast<jlong>(new EnhancedBookmarksBridge(
         env, obj, ProfileAndroid::FromProfileAndroid(j_profile)));
 }
 
 bool RegisterEnhancedBookmarksBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace enhanced_bookmarks