Revert of [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 121624e04566454518c1145aac7dc767f4598ba7..d11691820543d0421c8067cb722ea68f4b47a36e 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,22 +185,11 @@
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
-            finish();
+            onBackPressed();
             return true;
         } else if (item == mSaveButton) {
             assert mIsAddMode;
-
-            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();
-
+            if (save()) finish();
             return true;
         } else if (item == mDeleteButton) {
             assert !mIsAddMode;
@@ -214,12 +203,12 @@
     }
 
     @Override
-    protected void onStop() {
-        if (!mIsAddMode && mFolderTitle.isEmpty()) {
-            mModel.setBookmarkTitle(mFolderId, mFolderTitle.getTrimmedText());
-        }
-
-        super.onStop();
+    public void onBackPressed() {
+        if (!mIsAddMode) {
+            if (save()) finish();
+        } else {
+            super.onBackPressed();
+        }
     }
 
     @Override
@@ -241,6 +230,25 @@
         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));