[EnhancedBookmarks] Fix a crash on exiting while loading.

chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActionBar.java

Index: chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActionBar.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActionBar.java b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActionBar.java
index 4492daf96b36e5bb57a5bde6f788542ff06b3070..72390baf7f10946e68ce17b285b7bcd7af9d42d4 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActionBar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActionBar.java
@@ -80,12 +80,11 @@ public class EnhancedBookmarkActionBar extends Toolbar implements EnhancedBookma
 
     @Override
     public boolean onMenuItemClick(MenuItem menuItem) {
-        EnhancedBookmarksModel model = mDelegate.getModel();
         if (menuItem.getItemId() == R.id.edit_menu_id) {
             EnhancedBookmarkAddEditFolderActivity.startEditFolderActivity(getContext(),
                     mCurrentFolder.getId());
         } else if (menuItem.getItemId() == R.id.close_menu_id) {
-            mDelegate.finishActivityOnPhone();
+            EnhancedBookmarkUtils.finishActivityOnPhone(getContext());
             return true;
         } else if (menuItem.getItemId() == R.id.search_menu_id) {
             mDelegate.openSearchUI();
@@ -93,7 +92,7 @@ public class EnhancedBookmarkActionBar extends Toolbar implements EnhancedBookma
         } else if (menuItem.getItemId() == R.id.selection_mode_edit_menu_id) {
             List<BookmarkId> list = mDelegate.getSelectedBookmarks();
             assert list.size() == 1;
-            BookmarkItem item = model.getBookmarkById(list.get(0));
+            BookmarkItem item = mDelegate.getModel().getBookmarkById(list.get(0));
             if (item.isFolder()) {
                 EnhancedBookmarkAddEditFolderActivity.startEditFolderActivity(getContext(),
                         item.getId());