Rename EnhancedBookmarks to Bookmarks, part 1.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkEditActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkEditActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkEditActivity.java
similarity index 95%
rename from chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkEditActivity.java
rename to chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkEditActivity.java
index 94471c194ae827c502d8bdf887c1d807ddbed801..4be4c96de61721b928dd94e47d7c38854599d59a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkEditActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkEditActivity.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.Intent;
 import android.os.Bundle;
@@ -36,10 +36,10 @@ import org.chromium.content_public.browser.WebContents;
 /**
  * The activity that enables the user to modify the title, url and parent folder of a bookmark.
  */
-public class EnhancedBookmarkEditActivity extends EnhancedBookmarkActivityBase {
+public class BookmarkEditActivity extends BookmarkActivityBase {
     /** The intent extra specifying the ID of the bookmark to be edited. */
-    public static final String INTENT_BOOKMARK_ID = "EnhancedBookmarkEditActivity.BookmarkId";
-    public static final String INTENT_WEB_CONTENTS = "EnhancedBookmarkEditActivity.WebContents";
+    public static final String INTENT_BOOKMARK_ID = "BookmarkEditActivity.BookmarkId";
+    public static final String INTENT_WEB_CONTENTS = "BookmarkEditActivity.WebContents";
 
     private static final String TAG = "BookmarkEdit";
 
@@ -50,7 +50,7 @@ public class EnhancedBookmarkEditActivity extends EnhancedBookmarkActivityBase {
         VISIT,
     }
 
-    private EnhancedBookmarksModel mModel;
+    private BookmarkModel mModel;
     private BookmarkId mBookmarkId;
     private EmptyAlertEditText mTitleEditText;
     private EmptyAlertEditText mUrlEditText;
@@ -108,8 +108,8 @@ public class EnhancedBookmarkEditActivity extends EnhancedBookmarkActivityBase {
 
         int title = OfflinePageUtils.getStringId(R.string.edit_bookmark);
         setTitle(title);
-        EnhancedBookmarkUtils.setTaskDescriptionInDocumentMode(this, getString(title));
-        mModel = new EnhancedBookmarksModel();
+        BookmarkUtils.setTaskDescriptionInDocumentMode(this, getString(title));
+        mModel = new BookmarkModel();
         mBookmarkId = BookmarkId.getBookmarkIdFromString(
                 getIntent().getStringExtra(INTENT_BOOKMARK_ID));
         mModel.addObserver(mBookmarkModelObserver);
@@ -127,8 +127,8 @@ public class EnhancedBookmarkEditActivity extends EnhancedBookmarkActivityBase {
         mFolderTextView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                EnhancedBookmarkFolderSelectActivity.startFolderSelectActivity(
-                        EnhancedBookmarkEditActivity.this, mBookmarkId);
+                BookmarkFolderSelectActivity.startFolderSelectActivity(
+                        BookmarkEditActivity.this, mBookmarkId);
             }
         });
 
@@ -340,11 +340,10 @@ public class EnhancedBookmarkEditActivity extends EnhancedBookmarkActivityBase {
         // launch the bookmark directly.
         if (getCallingActivity() != null) {
             Intent intent = new Intent();
-            intent.putExtra(
-                    EnhancedBookmarkActivity.INTENT_VISIT_BOOKMARK_ID, mBookmarkId.toString());
+            intent.putExtra(BookmarkActivity.INTENT_VISIT_BOOKMARK_ID, mBookmarkId.toString());
             setResult(RESULT_OK, intent);
         } else {
-            EnhancedBookmarkUtils.openBookmark(
+            BookmarkUtils.openBookmark(
                     mModel, this, mBookmarkId, BookmarkLaunchLocation.BOOKMARK_EDITOR);
         }
         finish();