Rename EnhancedBookmarks to Bookmarks, part 1.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFilter.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkFilter.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFilter.java
similarity index 67%
rename from chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkFilter.java
rename to chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFilter.java
index 861afb2eba5a44c25d485845a7d528a15a23edcf..7870bf64b7cb482d8f6caed33d1b25774403b4c0 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkFilter.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFilter.java
@@ -2,22 +2,22 @@
 // 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;
 
 /**
  * Possible filters for the enhanced bookmarks.
  */
-enum EnhancedBookmarkFilter {
+enum BookmarkFilter {
     OFFLINE_PAGES("OFFLINE_PAGES");
 
     /**
-     * An {@link EnhancedBookmarkFilter} can be persisted in URLs. To ensure the
+     * An {@link BookmarkFilter} can be persisted in URLs. To ensure the
      * URLs are consistent, values should remain the same even after the enums
      * are renamed.
      */
     public final String value;
 
-    private EnhancedBookmarkFilter(String value) {
+    private BookmarkFilter(String value) {
         this.value = value;
     }
 }