Rename EnhancedBookmarks to Bookmarks, part 1.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFolderSelectActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkFolderSelectActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFolderSelectActivity.java
similarity index 90%
rename from chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkFolderSelectActivity.java
rename to chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFolderSelectActivity.java
index f48de3a968b8d0a50d6bad0e4817615ae8e52802..67240496a2b8e7727bb1ab4f55cc3408ec7466fa 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkFolderSelectActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFolderSelectActivity.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;
@@ -38,17 +38,17 @@ import java.util.List;
  * Note this fragment will not be restarted by OS. It will be dismissed if chrome is killed in
  * background.
  */
-public class EnhancedBookmarkFolderSelectActivity extends EnhancedBookmarkActivityBase implements
+public class BookmarkFolderSelectActivity extends BookmarkActivityBase implements
         AdapterView.OnItemClickListener {
     static final String
-            INTENT_SELECTED_FOLDER = "EnhancedBookmarkFolderSelectActivity.selectedFolder";
+            INTENT_SELECTED_FOLDER = "BookmarkFolderSelectActivity.selectedFolder";
     static final String
-            INTENT_IS_CREATING_FOLDER = "EnhancedBookmarkFolderSelectActivity.isCreatingFolder";
+            INTENT_IS_CREATING_FOLDER = "BookmarkFolderSelectActivity.isCreatingFolder";
     static final String
-            INTENT_BOOKMARKS_TO_MOVE = "EnhancedBookmarkFolderSelectActivity.bookmarksToMove";
+            INTENT_BOOKMARKS_TO_MOVE = "BookmarkFolderSelectActivity.bookmarksToMove";
     static final int CREATE_FOLDER_REQUEST_CODE = 13;
 
-    private EnhancedBookmarksModel mModel;
+    private BookmarkModel mModel;
     private boolean mIsCreatingFolder;
     private List<BookmarkId> mBookmarksToMove;
     private BookmarkId mParentId;
@@ -81,7 +81,7 @@ public class EnhancedBookmarkFolderSelectActivity extends EnhancedBookmarkActivi
      */
     public static void startFolderSelectActivity(Context context, BookmarkId... bookmarks) {
         assert bookmarks.length > 0;
-        Intent intent = new Intent(context, EnhancedBookmarkFolderSelectActivity.class);
+        Intent intent = new Intent(context, BookmarkFolderSelectActivity.class);
         intent.putExtra(INTENT_IS_CREATING_FOLDER, false);
         ArrayList<String> bookmarkStrings = new ArrayList<>(bookmarks.length);
         for (BookmarkId id : bookmarks) {
@@ -93,12 +93,12 @@ public class EnhancedBookmarkFolderSelectActivity extends EnhancedBookmarkActivi
 
     /**
      * Starts a select folder activity for the new folder that is about to be created. This method
-     * is only supposed to be called by {@link EnhancedBookmarkAddEditFolderActivity}
+     * is only supposed to be called by {@link BookmarkAddEditFolderActivity}
      */
     public static void startNewFolderSelectActivity(
-            EnhancedBookmarkAddEditFolderActivity activity, List<BookmarkId> bookmarks) {
+            BookmarkAddEditFolderActivity activity, List<BookmarkId> bookmarks) {
         assert bookmarks.size() > 0;
-        Intent intent = new Intent(activity, EnhancedBookmarkFolderSelectActivity.class);
+        Intent intent = new Intent(activity, BookmarkFolderSelectActivity.class);
         intent.putExtra(INTENT_IS_CREATING_FOLDER, true);
         ArrayList<String> bookmarkStrings = new ArrayList<>(bookmarks.size());
         for (BookmarkId id : bookmarks) {
@@ -106,15 +106,15 @@ public class EnhancedBookmarkFolderSelectActivity extends EnhancedBookmarkActivi
         }
         intent.putStringArrayListExtra(INTENT_BOOKMARKS_TO_MOVE, bookmarkStrings);
         activity.startActivityForResult(intent,
-                EnhancedBookmarkAddEditFolderActivity.PARENT_FOLDER_REQUEST_CODE);
+                BookmarkAddEditFolderActivity.PARENT_FOLDER_REQUEST_CODE);
     }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        EnhancedBookmarkUtils.setTaskDescriptionInDocumentMode(this,
+        BookmarkUtils.setTaskDescriptionInDocumentMode(this,
                 getString(R.string.enhanced_bookmark_choose_folder));
-        mModel = new EnhancedBookmarksModel();
+        mModel = new BookmarkModel();
         mModel.addObserver(mBookmarkModelObserver);
         List<String> stringList = getIntent().getStringArrayListExtra(INTENT_BOOKMARKS_TO_MOVE);
         mBookmarksToMove = new ArrayList<>(stringList.size());
@@ -211,10 +211,10 @@ public class EnhancedBookmarkFolderSelectActivity extends EnhancedBookmarkActivi
             setResult(RESULT_OK, intent);
             finish();
         } else if (entry.mType == FolderListEntry.TYPE_NEW_FOLDER) {
-            EnhancedBookmarkAddEditFolderActivity.startAddFolderActivity(this, mBookmarksToMove);
+            BookmarkAddEditFolderActivity.startAddFolderActivity(this, mBookmarksToMove);
         } else if (entry.mType == FolderListEntry.TYPE_NORMAL) {
             mModel.moveBookmarks(mBookmarksToMove, entry.mId);
-            EnhancedBookmarkUtils.setLastUsedParent(this, entry.mId);
+            BookmarkUtils.setLastUsedParent(this, entry.mId);
             finish();
         }
     }
@@ -225,9 +225,9 @@ public class EnhancedBookmarkFolderSelectActivity extends EnhancedBookmarkActivi
         assert !mIsCreatingFolder;
         if (requestCode == CREATE_FOLDER_REQUEST_CODE && resultCode == RESULT_OK) {
             BookmarkId createdBookmark = BookmarkId.getBookmarkIdFromString(data.getStringExtra(
-                    EnhancedBookmarkAddEditFolderActivity.INTENT_CREATED_BOOKMARK));
+                    BookmarkAddEditFolderActivity.INTENT_CREATED_BOOKMARK));
             mModel.moveBookmarks(mBookmarksToMove, createdBookmark);
-            EnhancedBookmarkUtils.setLastUsedParent(this, createdBookmark);
+            BookmarkUtils.setLastUsedParent(this, createdBookmark);
             finish();
         }
     }