[Android] Make enhanced bookmark editing UI more straightforward.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkAddEditFolderActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkAddEditFolderActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkAddEditFolderActivity.java
index d11691820543d0421c8067cb722ea68f4b47a36e..121624e04566454518c1145aac7dc767f4598ba7 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkAddEditFolderActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkAddEditFolderActivity.java
@@ -185,11 +185,22 @@ public class EnhancedBookmarkAddEditFolderActivity extends EnhancedBookmarkActiv
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
-            onBackPressed();
+            finish();
             return true;
         } else if (item == mSaveButton) {
             assert mIsAddMode;
-            if (save()) finish();
+
+            if (!mFolderTitle.isEmpty()) {
+                mFolderTitle.requestFocus();
+                return true;
+            }
+
+            BookmarkId newFolder = mModel.addFolder(mParentId, 0, mFolderTitle.getTrimmedText());
+            Intent intent = new Intent();
+            intent.putExtra(INTENT_CREATED_BOOKMARK, newFolder.toString());
+            setResult(RESULT_OK, intent);
+            finish();
+
             return true;
         } else if (item == mDeleteButton) {
             assert !mIsAddMode;
@@ -203,12 +214,12 @@ public class EnhancedBookmarkAddEditFolderActivity extends EnhancedBookmarkActiv
     }
 
     @Override
-    public void onBackPressed() {
-        if (!mIsAddMode) {
-            if (save()) finish();
-        } else {
-            super.onBackPressed();
+    protected void onStop() {
+        if (!mIsAddMode && mFolderTitle.isEmpty()) {
+            mModel.setBookmarkTitle(mFolderId, mFolderTitle.getTrimmedText());
         }
+
+        super.onStop();
     }
 
     @Override
@@ -230,25 +241,6 @@ public class EnhancedBookmarkAddEditFolderActivity extends EnhancedBookmarkActiv
         mModel = null;
     }
 
-    private boolean save() {
-        if (!mFolderTitle.validate()) {
-            mFolderTitle.requestFocus();
-            return false;
-        }
-
-        String folderTitle = mFolderTitle.getTrimmedText();
-        if (mIsAddMode) {
-            BookmarkId newFolder = mModel.addFolder(mParentId, 0, folderTitle);
-            Intent intent = new Intent();
-            intent.putExtra(INTENT_CREATED_BOOKMARK, newFolder.toString());
-            setResult(RESULT_OK, intent);
-        } else {
-            mModel.setBookmarkTitle(mFolderId, folderTitle);
-        }
-
-        return true;
-    }
-
     private void updateParent(BookmarkId newParent) {
         mParentId = newParent;
         mParentTextView.setText(mModel.getBookmarkTitle(mParentId));