[Enhanced Bookmark]Rewrite initialization logic

chrome/android/java/src/org/chromium/chrome/browser/bookmark/BookmarksBridge.java

 // Copyright 2013 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.
 
 package org.chromium.chrome.browser.bookmark;
 
 import android.util.Pair;
 
 import org.chromium.base.ObserverList;
 import org.chromium.base.VisibleForTesting;
@@ skipping 189 matching lines @@
     }
 
     /**
      * @return Whether or not the underlying bookmark model is loaded.
      */
     public boolean isBookmarkModelLoaded() {
         return mIsNativeBookmarkModelLoaded;
     }
 
     /**
+     * If bookmark model is loaded, execute the runnable immediately; otherwise schedule the

[newt (away), 2015/11/19 23:29:28]

s/execute/executes/

javadocs should describe what the method does (e.g. "Enables the lasers"),
rather than sound like a command. (inline comments, by constrast, are usually
written as commands, e.g. "Log a warning")

[Ian Wen, 2015/12/01 09:17:14]

Done.

+     * runnable till the model is loaded.
+     * @return Whether the given runnable is executed synchronously.
+     */
+    public boolean doAfterBookmarkModelLoaded(final Runnable runnable) {

[newt (away), 2015/11/19 23:29:28]

s/do/run/ to use consistent terminology

[Ian Wen, 2015/12/01 09:17:14]

Done.

+        if (isBookmarkModelLoaded()) {
+            runnable.run();
+            return true;
+        }
+        addObserver(new BookmarkModelObserver() {
+            @Override
+            public void bookmarkModelLoaded() {
+                removeObserver(this);
+                runnable.run();
+            }
+            @Override
+            public void bookmarkModelChanged() {
+            }
+        });
+        return false;
+    }
+
+    /**
      * @return A BookmarkItem instance for the given BookmarkId.
      *         <code>null</code> if it doesn't exist.
      */
     public BookmarkItem getBookmarkById(BookmarkId id) {
         assert mIsNativeBookmarkModelLoaded;
         return nativeGetBookmarkByID(mNativeBookmarksBridge, id.getId(), id.getType());
     }
 
     /**
      * @return All the permanent nodes.
@@ skipping 656 matching lines @@
                 case GET_CURRENT_FOLDER_HIERARCHY:
                     mHandler.getCurrentFolderHierarchy(mFolderId, mCallback);
                     break;
                 default:
                     assert false;
                     break;
             }
         }
     }
 }