Rename EnhancedBookmarks to Bookmarks, part 1.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkPromoHeader.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
similarity index 95%
rename from chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkPromoHeader.java
rename to chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
index c4e39e8f4a7c0245f31eb42d91b1f5a865bb531f..0b88740833d236d723e684a487b3ff17a6db7325 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkPromoHeader.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.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.content.Intent;
@@ -26,7 +26,7 @@ import org.chromium.sync.AndroidSyncSettings.AndroidSyncSettingsObserver;
  * Class that manages all the logic and UI behind the signin promo header in the enhanced bookmark
  * content UI. The header is shown only on certain situations, (e.g., not signed in).
  */
-class EnhancedBookmarkPromoHeader implements AndroidSyncSettingsObserver,
+class BookmarkPromoHeader implements AndroidSyncSettingsObserver,
         SignInStateObserver {
     /**
      * Interface to listen signin promo header visibility changes.
@@ -55,7 +55,7 @@ class EnhancedBookmarkPromoHeader implements AndroidSyncSettingsObserver,
      * Initializes the class. Note that this will start listening to signin related events and
      * update itself if needed.
      */
-    EnhancedBookmarkPromoHeader(Context context,
+    BookmarkPromoHeader(Context context,
             PromoHeaderShowingChangeListener showingChangeListener) {
         mContext = context;
         mShowingChangeListener = showingChangeListener;
@@ -113,7 +113,7 @@ class EnhancedBookmarkPromoHeader implements AndroidSyncSettingsObserver,
         promoHeader.findViewById(R.id.sign_in).setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View view) {
-                mContext.startActivity(new Intent(mContext, EnhancedBookmarkSigninActivity.class));
+                mContext.startActivity(new Intent(mContext, BookmarkSigninActivity.class));
             }
         });