Switch to EnhancedBookmarkModel from meta_accessor

chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.cc

Index: chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.cc
diff --git a/chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.cc b/chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.cc
index 655b785c71554c8d466ed5e5a0ff2b93cc14faa5..6015a0cc9351cc57f427e1b2ed8cffff4afc5cd8 100644
--- a/chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.cc
+++ b/chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.cc
@@ -16,7 +16,6 @@
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/bookmarks/common/android/bookmark_type.h"
 #include "components/enhanced_bookmarks/enhanced_bookmark_model.h"
-#include "components/enhanced_bookmarks/metadata_accessor.h"

[Kibeom Kim (inactive), 2014/10/26 05:34:56]

Can we delete metadata_accessor files with this CL?

 #include "jni/EnhancedBookmarksBridge_jni.h"
 
 using base::android::AttachCurrentThread;
@@ -30,8 +29,9 @@ EnhancedBookmarksBridge::EnhancedBookmarksBridge(JNIEnv* env,
     Profile* profile) : weak_java_ref_(env, obj) {
   profile_ = profile;
   bookmark_model_ = BookmarkModelFactory::GetForProfile(profile_);
-  EnhancedBookmarkModelFactory::GetForBrowserContext(profile_)->
-      SetVersionSuffix(chrome::VersionInfo().OSType());
+  enhanced_bookmark_model_ =
+      EnhancedBookmarkModelFactory::GetForBrowserContext(profile_);
+  enhanced_bookmark_model_->SetVersionSuffix(chrome::VersionInfo().OSType());
   cluster_service_ =
       ChromeBookmarkServerClusterServiceFactory::GetForBrowserContext(profile_);
   cluster_service_->AddObserver(this);
@@ -53,10 +53,9 @@ ScopedJavaLocalRef<jstring> EnhancedBookmarksBridge::GetBookmarkDescription(
   const BookmarkNode* node = bookmarks::GetBookmarkNodeByID(
       bookmark_model_, static_cast<int64>(id));
 
-  return node ?
-          base::android::ConvertUTF8ToJavaString(
-              env, enhanced_bookmarks::DescriptionFromBookmark(node)) :
-          ScopedJavaLocalRef<jstring>();
+  return node ? base::android::ConvertUTF8ToJavaString(
+                    env, enhanced_bookmark_model_->GetDescription(node))
+              : ScopedJavaLocalRef<jstring>();
 }
 
 void EnhancedBookmarksBridge::SetBookmarkDescription(JNIEnv* env,
@@ -70,9 +69,8 @@ void EnhancedBookmarksBridge::SetBookmarkDescription(JNIEnv* env,
   const BookmarkNode* node = bookmarks::GetBookmarkNodeByID(
       bookmark_model_, static_cast<int64>(id));
 
-  enhanced_bookmarks::SetDescriptionForBookmark(
-      bookmark_model_, node,
-      base::android::ConvertJavaStringToUTF8(env, description));
+  enhanced_bookmark_model_->SetDescription(
+      node, base::android::ConvertJavaStringToUTF8(env, description));
 }
 
 void EnhancedBookmarksBridge::GetBookmarksForFilter(JNIEnv* env,