Rename EnhancedBookmarks to Bookmarks, part 1.

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarksModelTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarksModelTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarksModelTest.java
similarity index 96%
rename from chrome/android/javatests/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarksModelTest.java
rename to chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarksModelTest.java
index 136a4ed20b4b457bb10007374c5f12bd7e8e5590..a2c575dbe740f0b34242be4301f01854fc48ba9f 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarksModelTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarksModelTest.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.test.UiThreadTest;
 import android.test.suitebuilder.annotation.SmallTest;
@@ -13,7 +13,7 @@ import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.bookmark.BookmarksBridge.BookmarkItem;
-import org.chromium.chrome.browser.enhancedbookmarks.EnhancedBookmarksModel.AddBookmarkCallback;
+import org.chromium.chrome.browser.bookmarks.BookmarksModel.AddBookmarkCallback;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.components.bookmarks.BookmarkId;
 import org.chromium.content.browser.test.NativeLibraryTestBase;
@@ -30,11 +30,11 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
- * Tests for {@link EnhancedBookmarksModel}, the data layer of Enhanced Bookmarks.
+ * Tests for {@link BookmarksModel}, the data layer of Enhanced Bookmarks.
  */
-public class EnhancedBookmarksModelTest extends NativeLibraryTestBase {
+public class BookmarksModelTest extends NativeLibraryTestBase {
     private static final int TIMEOUT_MS = 5000;
-    private EnhancedBookmarksModel mBookmarksModel;
+    private BookmarksModel mBookmarksModel;
     private BookmarkId mMobileNode;
     private BookmarkId mOtherNode;
     private BookmarkId mDesktopNode;
@@ -48,7 +48,7 @@ public class EnhancedBookmarksModelTest extends NativeLibraryTestBase {
             @Override
             public void run() {
                 Profile profile = Profile.getLastUsedProfile();
-                mBookmarksModel = new EnhancedBookmarksModel(profile);
+                mBookmarksModel = new BookmarksModel(profile);
                 mBookmarksModel.loadEmptyPartnerBookmarkShimForTesting();
             }
         });