Make ChromeActivity destroy its BookmarkModel in all cases when adding a bookmark..

One branch of control flow fails to destroy it, leaking native memory.

BUG=NONE

Review URL: https://codereview.chromium.org/1831183002

Cr-Commit-Position: refs/heads/master@{#383363}

1 files changed, 4 insertions, 0 deletions

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
index 12a2f8d..39e439b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
@@ -1054,8 +1054,12 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
             public void run() {
                 // Gives up the bookmarking if the tab is being destroyed.
                 if (!tabToBookmark.isClosing() && tabToBookmark.isInitialized()) {
+                    // The BookmarkModel will be destroyed by BookmarkUtils#addOrEditBookmark() when
+                    // done.
                     BookmarkUtils.addOrEditBookmark(bookmarkId, bookmarkModel,
                             tabToBookmark, getSnackbarManager(), ChromeActivity.this);
+                } else {
+                    bookmarkModel.destroy();
                 }
             }
         });