Rename EnhancedBookmarks to Bookmarks, part 1.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSearchView.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkSearchView.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSearchView.java
similarity index 90%
rename from chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkSearchView.java
rename to chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSearchView.java
index e6df4abf81abfd271dd3f16136b5597d12747df4..c71289de85175a8311388899ea9333c56488b46d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkSearchView.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSearchView.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.preference.PreferenceManager;
@@ -31,7 +31,7 @@ import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.bookmark.BookmarksBridge.BookmarkItem;
 import org.chromium.chrome.browser.bookmark.BookmarksBridge.BookmarkModelObserver;
-import org.chromium.chrome.browser.enhancedbookmarks.EnhancedBookmarkSearchRow.SearchHistoryDelegate;
+import org.chromium.chrome.browser.bookmarks.BookmarkSearchRow.SearchHistoryDelegate;
 import org.chromium.components.bookmarks.BookmarkId;
 import org.chromium.ui.UiUtils;
 import org.json.JSONArray;
@@ -44,8 +44,8 @@ import java.util.List;
  * Activity for searching bookmarks. Search results will be updated when user is typing. Before
  * typing, a list of search history is shown.
  */
-public class EnhancedBookmarkSearchView extends LinearLayout implements OnItemClickListener,
-        OnEditorActionListener, EnhancedBookmarkUIObserver, SearchHistoryDelegate {
+public class BookmarkSearchView extends LinearLayout implements OnItemClickListener,
+        OnEditorActionListener, BookmarkUIObserver, SearchHistoryDelegate {
     /**
      * A custom {@link ViewSwitcher} that wraps another {@link ViewSwitcher} inside.
      */
@@ -92,8 +92,8 @@ public class EnhancedBookmarkSearchView extends LinearLayout implements OnItemCl
     private static final int HISTORY_ITEM_PADDING_START_DP = 72;
     private static final int MAXIMUM_NUMBER_OF_RESULTS = 500;
 
-    private EnhancedBookmarksModel mEnhancedBookmarksModel;
-    private EnhancedBookmarkDelegate mDelegate;
+    private BookmarkModel mBookmarkModel;
+    private BookmarkDelegate mDelegate;
     private EditText mSearchText;
     private ListView mResultList;
     private ListView mHistoryList;
@@ -121,7 +121,7 @@ public class EnhancedBookmarkSearchView extends LinearLayout implements OnItemCl
     /**
      * Constructor for inflating from XML.
      */
-    public EnhancedBookmarkSearchView(Context context, AttributeSet attrs) {
+    public BookmarkSearchView(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
@@ -194,7 +194,7 @@ public class EnhancedBookmarkSearchView extends LinearLayout implements OnItemCl
         String currentText = mSearchText.getText().toString().trim();
         if (TextUtils.isEmpty(currentText)) return;
 
-        List<BookmarkMatch> results = mEnhancedBookmarksModel.searchBookmarks(currentText,
+        List<BookmarkMatch> results = mBookmarkModel.searchBookmarks(currentText,
                 MAXIMUM_NUMBER_OF_RESULTS);
         populateResultListView(results);
     }
@@ -250,16 +250,16 @@ public class EnhancedBookmarkSearchView extends LinearLayout implements OnItemCl
     protected void onVisibilityChanged(View changedView, int visibility) {
         super.onVisibilityChanged(changedView, visibility);
         // This method might be called very early. Null check on bookmark model here.
-        if (mEnhancedBookmarksModel == null) return;
+        if (mBookmarkModel == null) return;
 
         if (visibility == View.VISIBLE) {
-            mEnhancedBookmarksModel.addObserver(mModelObserver);
+            mBookmarkModel.addObserver(mModelObserver);
             updateHistoryList();
             mSearchText.requestFocus();
             UiUtils.showKeyboard(mSearchText);
         } else {
             UiUtils.hideKeyboard(mSearchText);
-            mEnhancedBookmarksModel.removeObserver(mModelObserver);
+            mBookmarkModel.removeObserver(mModelObserver);
             resetUI();
             clearFocus();
         }
@@ -334,18 +334,18 @@ public class EnhancedBookmarkSearchView extends LinearLayout implements OnItemCl
         saveHistoryList((addCurrentTextToHistoryList(readHistoryList())));
     }
 
-    // EnhancedBookmarkUIObserver implementation
+    // BookmarkUIObserver implementation
 
     @Override
-    public void onEnhancedBookmarkDelegateInitialized(EnhancedBookmarkDelegate delegate) {
+    public void onBookmarkDelegateInitialized(BookmarkDelegate delegate) {
         mDelegate = delegate;
         mDelegate.addUIObserver(this);
-        mEnhancedBookmarksModel = mDelegate.getModel();
+        mBookmarkModel = mDelegate.getModel();
     }
 
     @Override
     public void onDestroy() {
-        mEnhancedBookmarksModel.removeObserver(mModelObserver);
+        mBookmarkModel.removeObserver(mModelObserver);
         mDelegate.removeUIObserver(this);
     }
 
@@ -358,7 +358,7 @@ public class EnhancedBookmarkSearchView extends LinearLayout implements OnItemCl
     }
 
     @Override
-    public void onFilterStateSet(EnhancedBookmarkFilter filter) {
+    public void onFilterStateSet(BookmarkFilter filter) {
     }
 
     @Override
@@ -366,11 +366,11 @@ public class EnhancedBookmarkSearchView extends LinearLayout implements OnItemCl
     }
 
     private class ResultListAdapter extends BaseAdapter {
-        private EnhancedBookmarkDelegate mDelegate;
+        private BookmarkDelegate mDelegate;
         private List<BookmarkMatch> mBookmarktList;
 
         public ResultListAdapter(List<BookmarkMatch> bookmarkMatches,
-                EnhancedBookmarkDelegate delegate) {
+                BookmarkDelegate delegate) {
             mDelegate = delegate;
             mBookmarktList = bookmarkMatches;
         }
@@ -397,10 +397,10 @@ public class EnhancedBookmarkSearchView extends LinearLayout implements OnItemCl
                 convertView = LayoutInflater.from(parent.getContext()).inflate(
                         R.layout.eb_search_row, parent, false);
             }
-            final EnhancedBookmarkSearchRow row = (EnhancedBookmarkSearchRow) convertView;
-            row.onEnhancedBookmarkDelegateInitialized(mDelegate);
+            final BookmarkSearchRow row = (BookmarkSearchRow) convertView;
+            row.onBookmarkDelegateInitialized(mDelegate);
             row.setBookmarkId(bookmarkMatch.getBookmarkId());
-            row.setSearchHistoryDelegate(EnhancedBookmarkSearchView.this);
+            row.setSearchHistoryDelegate(BookmarkSearchView.this);
             return convertView;
         }
     }