Rename EnhancedBookmarks to Bookmarks, part 1.

chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkUtilsTest.java

Index: chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkUtilsTest.java
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUtilsTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkUtilsTest.java
similarity index 78%
rename from chrome/android/junit/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUtilsTest.java
rename to chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkUtilsTest.java
index f6133d00d340eb0f2fa75e52a63d627f671af4d7..a83f662f59d711cacbdd903091e1d0f4bdcfe188 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUtilsTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkUtilsTest.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 static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -25,13 +25,13 @@ import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
 /**
- * Robolectric tests for {@link EnhancedBookmarkUtils}.
+ * Robolectric tests for {@link BookmarkUtils}.
  */
 @RunWith(LocalRobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
-public class EnhancedBookmarkUtilsTest {
+public class BookmarkUtilsTest {
     @Mock private Context mContext;
-    @Mock private EnhancedBookmarksModel mEnhancedBookmarksModel;
+    @Mock private BookmarkModel mBookmarkModel;
     @Mock private WebContents mWebContents;
 
     @Before
@@ -43,27 +43,27 @@ public class EnhancedBookmarkUtilsTest {
     @Feature({"Bookmark"})
     public void testStartEditActivityWithoutWebContents() {
         BookmarkId bookmarkId = new BookmarkId(12345L, BookmarkType.NORMAL);
-        EnhancedBookmarkUtils.startEditActivity(mContext, bookmarkId, null /* webContents */);
+        BookmarkUtils.startEditActivity(mContext, bookmarkId, null /* webContents */);
         ArgumentCaptor<Intent> intentArgumentCaptor = ArgumentCaptor.forClass(Intent.class);
 
         verify(mContext).startActivity(intentArgumentCaptor.capture());
 
         // Verify that the intent doesn't contain the WEB_CONTENTS extra.
         assertFalse(intentArgumentCaptor.getValue()
-                .hasExtra(EnhancedBookmarkEditActivity.INTENT_WEB_CONTENTS));
+                .hasExtra(BookmarkEditActivity.INTENT_WEB_CONTENTS));
     }
 
     @Test
     @Feature({"Bookmark"})
     public void testStartEditActivityWithWebContents() {
         BookmarkId bookmarkId = new BookmarkId(12345L, BookmarkType.NORMAL);
-        EnhancedBookmarkUtils.startEditActivity(mContext, bookmarkId, mWebContents);
+        BookmarkUtils.startEditActivity(mContext, bookmarkId, mWebContents);
         ArgumentCaptor<Intent> intentArgumentCaptor = ArgumentCaptor.forClass(Intent.class);
 
         verify(mContext).startActivity(intentArgumentCaptor.capture());
 
         // Verify that the intent contains the right WEB_CONTENTS extra.
         assertEquals(mWebContents, intentArgumentCaptor.getValue()
-                .getParcelableExtra(EnhancedBookmarkEditActivity.INTENT_WEB_CONTENTS));
+                .getParcelableExtra(BookmarkEditActivity.INTENT_WEB_CONTENTS));
     }
 }