Rename EnhancedBookmarks to Bookmarks, part 1.

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkAddEditFolderActivity.java

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkAddEditFolderActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkAddEditFolderActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkAddEditFolderActivity.java
similarity index 85%
rename from chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkAddEditFolderActivity.java
rename to chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkAddEditFolderActivity.java
index 70e1529150724ad153f8adcc417c4ad6597d07be..3992014ebbd2b29c69f224aedc165174577311a0 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkAddEditFolderActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkAddEditFolderActivity.java
@@ -2,7 +2,7 @@
 // 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.enhancedbookmarks;
+package org.chromium.chrome.browser.bookmarks;
 
 import android.content.Context;
 import android.content.Intent;
@@ -29,17 +29,17 @@ import java.util.List;
  * mode and editing mode. Depending on different modes, it should be started via two static creator
  * functions.
  */
-public class EnhancedBookmarkAddEditFolderActivity extends EnhancedBookmarkActivityBase
+public class BookmarkAddEditFolderActivity extends BookmarkActivityBase
         implements OnClickListener {
-    static final String INTENT_IS_ADD_MODE = "EnhancedBookmarkAddEditFolderActivity.isAddMode";
-    static final String INTENT_BOOKMARK_ID = "EnhancedBookmarkAddEditFolderActivity.BookmarkId";
+    static final String INTENT_IS_ADD_MODE = "BookmarkAddEditFolderActivity.isAddMode";
+    static final String INTENT_BOOKMARK_ID = "BookmarkAddEditFolderActivity.BookmarkId";
     static final String
-            INTENT_CREATED_BOOKMARK = "EnhancedBookmarkAddEditFolderActivity.createdBookmark";
+            INTENT_CREATED_BOOKMARK = "BookmarkAddEditFolderActivity.createdBookmark";
     static final int PARENT_FOLDER_REQUEST_CODE = 10;
 
     private boolean mIsAddMode;
     private BookmarkId mParentId;
-    private EnhancedBookmarksModel mModel;
+    private BookmarkModel mModel;
     private TextView mParentTextView;
     private EmptyAlertEditText mFolderTitle;
 
@@ -88,7 +88,7 @@ public class EnhancedBookmarkAddEditFolderActivity extends EnhancedBookmarkActiv
      * Starts an edit folder activity. Require the context to fire an intent.
      */
     public static void startEditFolderActivity(Context context, BookmarkId idToEdit) {
-        Intent intent = new Intent(context, EnhancedBookmarkAddEditFolderActivity.class);
+        Intent intent = new Intent(context, BookmarkAddEditFolderActivity.class);
         intent.putExtra(INTENT_IS_ADD_MODE, false);
         intent.putExtra(INTENT_BOOKMARK_ID, idToEdit.toString());
         context.startActivity(intent);
@@ -96,34 +96,34 @@ public class EnhancedBookmarkAddEditFolderActivity extends EnhancedBookmarkActiv
 
     /**
      * Starts an add folder activity. This method should only be called by
-     * {@link EnhancedBookmarkFolderSelectActivity}.
+     * {@link BookmarkFolderSelectActivity}.
      */
-    public static void startAddFolderActivity(EnhancedBookmarkFolderSelectActivity activity,
+    public static void startAddFolderActivity(BookmarkFolderSelectActivity activity,
             List<BookmarkId> bookmarksToMove) {
         assert bookmarksToMove.size() > 0;
-        Intent intent = new Intent(activity, EnhancedBookmarkAddEditFolderActivity.class);
+        Intent intent = new Intent(activity, BookmarkAddEditFolderActivity.class);
         intent.putExtra(INTENT_IS_ADD_MODE, true);
         ArrayList<String> bookmarkStrings = new ArrayList<>(bookmarksToMove.size());
         for (BookmarkId id : bookmarksToMove) {
             bookmarkStrings.add(id.toString());
         }
         intent.putStringArrayListExtra(
-                EnhancedBookmarkFolderSelectActivity.INTENT_BOOKMARKS_TO_MOVE, bookmarkStrings);
+                BookmarkFolderSelectActivity.INTENT_BOOKMARKS_TO_MOVE, bookmarkStrings);
         activity.startActivityForResult(intent,
-                EnhancedBookmarkFolderSelectActivity.CREATE_FOLDER_REQUEST_CODE);
+                BookmarkFolderSelectActivity.CREATE_FOLDER_REQUEST_CODE);
     }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        EnhancedBookmarkUtils.setTaskDescriptionInDocumentMode(this,
+        BookmarkUtils.setTaskDescriptionInDocumentMode(this,
                 getString(R.string.enhanced_bookmark_action_bar_edit_folder));
-        mModel = new EnhancedBookmarksModel();
+        mModel = new BookmarkModel();
         mModel.addObserver(mBookmarkModelObserver);
         mIsAddMode = getIntent().getBooleanExtra(INTENT_IS_ADD_MODE, false);
         if (mIsAddMode) {
             List<String> stringList = getIntent().getStringArrayListExtra(
-                    EnhancedBookmarkFolderSelectActivity.INTENT_BOOKMARKS_TO_MOVE);
+                    BookmarkFolderSelectActivity.INTENT_BOOKMARKS_TO_MOVE);
             mBookmarksToMove = new ArrayList<>(stringList.size());
             for (String string : stringList) {
                 mBookmarksToMove.add(BookmarkId.getBookmarkIdFromString(string));
@@ -164,10 +164,10 @@ public class EnhancedBookmarkAddEditFolderActivity extends EnhancedBookmarkActiv
         assert v == mParentTextView;
 
         if (mIsAddMode) {
-            EnhancedBookmarkFolderSelectActivity.startNewFolderSelectActivity(
+            BookmarkFolderSelectActivity.startNewFolderSelectActivity(
                     this, mBookmarksToMove);
         } else {
-            EnhancedBookmarkFolderSelectActivity.startFolderSelectActivity(this, mFolderId);
+            BookmarkFolderSelectActivity.startFolderSelectActivity(this, mFolderId);
         }
     }
 
@@ -234,7 +234,7 @@ public class EnhancedBookmarkAddEditFolderActivity extends EnhancedBookmarkActiv
         assert mIsAddMode;
         if (requestCode == PARENT_FOLDER_REQUEST_CODE && resultCode == RESULT_OK) {
             BookmarkId selectedBookmark = BookmarkId.getBookmarkIdFromString(data.getStringExtra(
-                    EnhancedBookmarkFolderSelectActivity.INTENT_SELECTED_FOLDER));
+                    BookmarkFolderSelectActivity.INTENT_SELECTED_FOLDER));
             updateParent(selectedBookmark);
         }
     }