Switch to EnhancedBookmarkModel from meta_accessor

chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.h

 // 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.
 
 #ifndef CHROME_BROWSER_ANDROID_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARKS_BRIDGE_H_
 #define CHROME_BROWSER_ANDROID_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARKS_BRIDGE_H_
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_weak_ref.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 29 matching lines @@
                              jobject j_result_obj);
   base::android::ScopedJavaLocalRef<jobjectArray> GetFilters(JNIEnv* env,
                                                              jobject obj);
 
   // BookmarkServerServiceObserver
   // Called on changes to cluster data
   virtual void OnChange(BookmarkServerService* service) override;
 
  private:
   JavaObjectWeakGlobalRef weak_java_ref_;
+  EnhancedBookmarkModel* enhanced_bookmark_model_;
   BookmarkModel* bookmark_model_;  // weak

[Rune Fevang, 2014/10/27 19:52:27]

You don't have to store the bookmark model any more, it is accessible from the
enhanced model (bookmark_model()).

   BookmarkServerClusterService* cluster_service_;  // weak
   Profile* profile_;                       // weak
   DISALLOW_COPY_AND_ASSIGN(EnhancedBookmarksBridge);
 };
 
 bool RegisterEnhancedBookmarksBridge(JNIEnv* env);
 
 }  // namespace android
 }  // namespace enhanced_bookmarks
 
 #endif  // CHROME_BROWSER_ANDROID_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARKS_BRIDGE_H_