Add tests to EnhancedBookmarksModel

chrome/browser/enhanced_bookmarks/android/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/enhanced_bookmarks/android/enhanced_bookmarks_bridge.h"
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
@@ skipping 186 matching lines @@
   long bookmark_id = JavaBookmarkIdGetId(env, j_parent_id_obj);
   const BookmarkNode* parent = bookmarks::GetBookmarkNodeByID(
       enhanced_bookmark_model_->bookmark_model(),
       static_cast<int64>(bookmark_id));
   const BookmarkNode* new_node = enhanced_bookmark_model_->AddFolder(
       parent, index, base::android::ConvertJavaStringToUTF16(env, j_title));
   if (!new_node) {
     NOTREACHED();
     return ScopedJavaLocalRef<jobject>();
   }
-  ScopedJavaLocalRef<jobject> new_java_obj =
-      JavaBookmarkIdCreateBookmarkId(env, new_node->id(), new_node->type());
+  ScopedJavaLocalRef<jobject> new_java_obj = JavaBookmarkIdCreateBookmarkId(
+      env, new_node->id(), BookmarkType::BOOKMARK_TYPE_NORMAL);

[Kibeom Kim (inactive), 2015/02/13 23:26:26]

Since this should be merged, wouldn't it be easier to make this a separate CL?
Also we'll need a proper bug for merge-request.

[Ian Wen, 2015/02/13 23:56:43]

crbug.com/458703 I will have a specific CL on M41.

   return new_java_obj;
 }
 
 void EnhancedBookmarksBridge::MoveBookmark(JNIEnv* env,
                                            jobject obj,
                                            jobject j_bookmark_id_obj,
                                            jobject j_parent_id_obj) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(enhanced_bookmark_model_->loaded());
 
@@ skipping 29 matching lines @@
   const BookmarkNode* new_node = enhanced_bookmark_model_->AddURL(
       parent,
       index,
       base::android::ConvertJavaStringToUTF16(env, j_title),
       GURL(base::android::ConvertJavaStringToUTF16(env, j_url)),
       base::Time::Now());
   if (!new_node) {
     NOTREACHED();
     return ScopedJavaLocalRef<jobject>();
   }
-  ScopedJavaLocalRef<jobject> new_java_obj =
-      JavaBookmarkIdCreateBookmarkId(env, new_node->id(), new_node->type());
+  ScopedJavaLocalRef<jobject> new_java_obj = JavaBookmarkIdCreateBookmarkId(
+      env, new_node->id(), BookmarkType::BOOKMARK_TYPE_NORMAL);
   return new_java_obj;
 }
 
 void EnhancedBookmarksBridge::SendSearchRequest(JNIEnv* env,
                                                 jobject obj,
                                                 jstring j_query) {
   search_service_->Search(base::android::ConvertJavaStringToUTF8(env, j_query));
 }
 
 ScopedJavaLocalRef<jobject> EnhancedBookmarksBridge::GetSearchResults(
@@ skipping 47 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