Rename EnhancedBookmarks to Bookmarks, part 1.

chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkTest.java
similarity index 78%
rename from chrome/android/javatests/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkTest.java
rename to chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkTest.java
index e2c64f31cc691a8bac60333d66c368d0c58b581d..345644d05b80ebd29bd5ebe3e55c668b3523823c 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkTest.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.net.Uri;
@@ -40,9 +40,9 @@ import java.util.concurrent.TimeoutException;
 /**
  * Tests for the enhanced bookmark manager.
  */
-public class EnhancedBookmarkTest extends ChromeActivityTestCaseBase<ChromeActivity> {
+public class BookmarkTest extends ChromeActivityTestCaseBase<ChromeActivity> {
 
-    public EnhancedBookmarkTest() {
+    public BookmarkTest() {
         super(ChromeActivity.class);
     }
 
@@ -50,8 +50,8 @@ public class EnhancedBookmarkTest extends ChromeActivityTestCaseBase<ChromeActiv
             "chrome/test/data/android/google.html");
     private static final String TEST_PAGE_TITLE = "The Google";
 
-    private EnhancedBookmarksModel mBookmarkModel;
-    protected EnhancedBookmarkRecyclerView mItemsContainer;
+    private BookmarkModel mBookmarkModel;
+    protected BookmarkRecyclerView mItemsContainer;
 
     @Override
     public void startMainActivity() throws InterruptedException {
@@ -59,7 +59,7 @@ public class EnhancedBookmarkTest extends ChromeActivityTestCaseBase<ChromeActiv
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                mBookmarkModel = new EnhancedBookmarksModel(
+                mBookmarkModel = new BookmarkModel(
                         getActivity().getActivityTab().getProfile());
             }
         });
@@ -96,14 +96,14 @@ public class EnhancedBookmarkTest extends ChromeActivityTestCaseBase<ChromeActiv
     private void openBookmarkManager() throws InterruptedException {
         if (DeviceFormFactor.isTablet(getActivity())) {
             loadUrl(UrlConstants.BOOKMARKS_URL);
-            mItemsContainer = (EnhancedBookmarkRecyclerView) getActivity().findViewById(
+            mItemsContainer = (BookmarkRecyclerView) getActivity().findViewById(
                     R.id.eb_items_container);
         } else {
             // phone
-            EnhancedBookmarkActivity activity = ActivityUtils.waitForActivity(getInstrumentation(),
-                    EnhancedBookmarkActivity.class, new MenuUtils.MenuActivityTrigger(
+            BookmarkActivity activity = ActivityUtils.waitForActivity(getInstrumentation(),
+                    BookmarkActivity.class, new MenuUtils.MenuActivityTrigger(
                             getInstrumentation(), getActivity(), R.id.all_bookmarks_menu_id));
-            mItemsContainer = (EnhancedBookmarkRecyclerView) activity.findViewById(
+            mItemsContainer = (BookmarkRecyclerView) activity.findViewById(
                     R.id.eb_items_container);
         }
     }
@@ -111,21 +111,21 @@ public class EnhancedBookmarkTest extends ChromeActivityTestCaseBase<ChromeActiv
     private void openBookmarkManager(final String url) throws InterruptedException {
         if (DeviceFormFactor.isTablet(getActivity())) {
             loadUrl(url);
-            mItemsContainer = (EnhancedBookmarkRecyclerView) getActivity().findViewById(
+            mItemsContainer = (BookmarkRecyclerView) getActivity().findViewById(
                     R.id.eb_items_container);
         } else {
             // phone
-            EnhancedBookmarkActivity activity = ActivityUtils.waitForActivity(getInstrumentation(),
-                    EnhancedBookmarkActivity.class, new Runnable() {
+            BookmarkActivity activity = ActivityUtils.waitForActivity(getInstrumentation(),
+                    BookmarkActivity.class, new Runnable() {
                         @Override
                         public void run() {
                             Intent intent = new Intent(getActivity(),
-                                    EnhancedBookmarkActivity.class);
+                                    BookmarkActivity.class);
                             intent.setData(Uri.parse(url));
                             getActivity().startActivity(intent);
                         }
                     });
-            mItemsContainer = (EnhancedBookmarkRecyclerView) activity.findViewById(
+            mItemsContainer = (BookmarkRecyclerView) activity.findViewById(
                     R.id.eb_items_container);
         }
     }
@@ -154,7 +154,7 @@ public class EnhancedBookmarkTest extends ChromeActivityTestCaseBase<ChromeActiv
         // Click star button to bookmark the curent tab.
         MenuUtils.invokeCustomMenuActionSync(getInstrumentation(), getActivity(),
                 R.id.bookmark_this_page_id);
-        // All actions with EnhancedBookmarksModel needs to run on UI thread.
+        // All actions with BookmarkModel needs to run on UI thread.
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
@@ -198,58 +198,58 @@ public class EnhancedBookmarkTest extends ChromeActivityTestCaseBase<ChromeActiv
         BookmarkId bookmarkBarId = mBookmarkModel.getDesktopFolderId();
         BookmarkId otherId = mBookmarkModel.getOtherFolderId();
         assertEquals("chrome-native://bookmarks/folder/" + mobileId,
-                EnhancedBookmarkUIState.createFolderUrl(mobileId).toString());
+                BookmarkUIState.createFolderUrl(mobileId).toString());
         assertEquals("chrome-native://bookmarks/folder/" + bookmarkBarId,
-                EnhancedBookmarkUIState.createFolderUrl(bookmarkBarId).toString());
+                BookmarkUIState.createFolderUrl(bookmarkBarId).toString());
         assertEquals("chrome-native://bookmarks/folder/" + otherId,
-                EnhancedBookmarkUIState.createFolderUrl(otherId).toString());
+                BookmarkUIState.createFolderUrl(otherId).toString());
 
-        assertEquals("chrome-native://bookmarks/filter/OFFLINE_PAGES", EnhancedBookmarkUIState
-                .createFilterUrl(EnhancedBookmarkFilter.OFFLINE_PAGES, true).toString());
+        assertEquals("chrome-native://bookmarks/filter/OFFLINE_PAGES", BookmarkUIState
+                .createFilterUrl(BookmarkFilter.OFFLINE_PAGES, true).toString());
         assertEquals(
                 "chrome-native://bookmarks/filter/OFFLINE_PAGES?persist=0",
-                EnhancedBookmarkUIState.createFilterUrl(EnhancedBookmarkFilter.OFFLINE_PAGES,
+                BookmarkUIState.createFilterUrl(BookmarkFilter.OFFLINE_PAGES,
                         false).toString());
     }
 
     @SmallTest
     public void testOpenBookmarkManager() throws InterruptedException {
         openBookmarkManager();
-        EnhancedBookmarkDelegate delegate = mItemsContainer.getDelegateForTesting();
-        assertEquals(EnhancedBookmarkUIState.STATE_ALL_BOOKMARKS, delegate.getCurrentState());
+        BookmarkDelegate delegate = mItemsContainer.getDelegateForTesting();
+        assertEquals(BookmarkUIState.STATE_ALL_BOOKMARKS, delegate.getCurrentState());
         assertEquals(UrlConstants.BOOKMARKS_URL,
-                EnhancedBookmarkUtils.getLastUsedUrl(getActivity()));
+                BookmarkUtils.getLastUsedUrl(getActivity()));
     }
 
     @SmallTest
     @CommandLineFlags.Add(ChromeSwitches.ENABLE_OFFLINE_PAGES)
     public void testOpenBookmarkManagerInOfflinePagePersist() throws InterruptedException {
-        EnhancedBookmarkUtils.setLastUsedUrl(getActivity(), UrlConstants.BOOKMARKS_URL);
+        BookmarkUtils.setLastUsedUrl(getActivity(), UrlConstants.BOOKMARKS_URL);
         String url = "chrome-native://bookmarks/filter/OFFLINE_PAGES";
         openBookmarkManager(url);
-        EnhancedBookmarkDelegate delegate = mItemsContainer.getDelegateForTesting();
-        assertEquals(EnhancedBookmarkUIState.STATE_FILTER, delegate.getCurrentState());
-        assertEquals(url, EnhancedBookmarkUtils.getLastUsedUrl(getActivity()));
+        BookmarkDelegate delegate = mItemsContainer.getDelegateForTesting();
+        assertEquals(BookmarkUIState.STATE_FILTER, delegate.getCurrentState());
+        assertEquals(url, BookmarkUtils.getLastUsedUrl(getActivity()));
     }
 
     @SmallTest
     @CommandLineFlags.Add(ChromeSwitches.ENABLE_OFFLINE_PAGES)
     public void testOpenBookmarkManagerInOfflinePageNoPersist() throws InterruptedException {
-        EnhancedBookmarkUtils.setLastUsedUrl(getActivity(), UrlConstants.BOOKMARKS_URL);
+        BookmarkUtils.setLastUsedUrl(getActivity(), UrlConstants.BOOKMARKS_URL);
         String url = "chrome-native://bookmarks/filter/OFFLINE_PAGES?persist=0";
         openBookmarkManager(url);
-        EnhancedBookmarkDelegate delegate = mItemsContainer.getDelegateForTesting();
-        assertEquals(EnhancedBookmarkUIState.STATE_FILTER, delegate.getCurrentState());
+        BookmarkDelegate delegate = mItemsContainer.getDelegateForTesting();
+        assertEquals(BookmarkUIState.STATE_FILTER, delegate.getCurrentState());
         assertEquals(UrlConstants.BOOKMARKS_URL,
-                EnhancedBookmarkUtils.getLastUsedUrl(getActivity()));
+                BookmarkUtils.getLastUsedUrl(getActivity()));
     }
 
     @SmallTest
     @CommandLineFlags.Add(ChromeSwitches.DISABLE_OFFLINE_PAGES)
     public void testOpenBookmarkManagerInOfflinePageWhenDisabled() throws InterruptedException {
         openBookmarkManager("chrome-native://bookmarks/filter/OFFLINE_PAGES");
-        EnhancedBookmarkDelegate delegate = mItemsContainer.getDelegateForTesting();
-        assertEquals(EnhancedBookmarkUIState.STATE_ALL_BOOKMARKS, delegate.getCurrentState());
+        BookmarkDelegate delegate = mItemsContainer.getDelegateForTesting();
+        assertEquals(BookmarkUIState.STATE_ALL_BOOKMARKS, delegate.getCurrentState());
     }
 
     /**