Rename EnhancedBookmarks to Bookmarks, part 1.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkAddActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkAddActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkAddActivity.java
similarity index 80%
rename from chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkAddActivity.java
rename to chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkAddActivity.java
index 22d7f3a2361829a5a6de03904d8b18cefefd8468..22bc60918f05344b4a5f94cad155a15e526de743 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkAddActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkAddActivity.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 org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.browser.init.AsyncInitializationActivity;
@@ -19,12 +19,12 @@ import org.chromium.components.bookmarks.BookmarkId;
  *
  * TODO(newt): remove this once Android L is no longer supported.
  */
-public class EnhancedBookmarkAddActivity extends AsyncInitializationActivity {
+public class BookmarkAddActivity extends AsyncInitializationActivity {
 
     private static final String EXTRA_TITLE = "title";
     private static final String EXTRA_URL = "url";
 
-    private EnhancedBookmarksModel mModel;
+    private BookmarkModel mModel;
 
     @Override
     protected void setContentView() {}
@@ -41,14 +41,14 @@ public class EnhancedBookmarkAddActivity extends AsyncInitializationActivity {
 
         // Store mModel as a member variable so it can't be garbage collected. Otherwise the
         // Runnable might never be run.
-        mModel = new EnhancedBookmarksModel();
+        mModel = new BookmarkModel();
         mModel.runAfterBookmarkModelLoaded(new Runnable() {
             @Override
             public void run() {
-                BookmarkId bookmarkId = EnhancedBookmarkUtils.addBookmarkSilently(
-                        EnhancedBookmarkAddActivity.this, mModel, title, url);
+                BookmarkId bookmarkId = BookmarkUtils.addBookmarkSilently(
+                        BookmarkAddActivity.this, mModel, title, url);
                 if (bookmarkId != null) {
-                    EnhancedBookmarkUtils.startEditActivity(EnhancedBookmarkAddActivity.this,
+                    BookmarkUtils.startEditActivity(BookmarkAddActivity.this,
                             bookmarkId, null);
                 }
                 finish();