Rename EnhancedBookmarks to Bookmarks, part 2.

chrome/android/java/res/values-v17/styles.xml

Index: chrome/android/java/res/values-v17/styles.xml
diff --git a/chrome/android/java/res/values-v17/styles.xml b/chrome/android/java/res/values-v17/styles.xml
index cab7be6eb5124dc9d7d401b1ee6b406a66b9dce5..fa3f4809ca1776aed62d02a8315651c6ae9eab16 100644
--- a/chrome/android/java/res/values-v17/styles.xml
+++ b/chrome/android/java/res/values-v17/styles.xml
@@ -332,8 +332,8 @@
         <item name="windowActionBar">false</item>
     </style>
 
-    <!-- Enhanced bookmarks -->
-    <style name="EnhancedBookmarkDialog" parent="Theme.AppCompat.Light.DialogWhenLarge">
+    <!-- Bookmarks -->
+    <style name="BookmarkDialog" parent="Theme.AppCompat.Light.DialogWhenLarge">
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="colorPrimaryDark">@android:color/black</item>
         <item name="colorAccent">@color/light_active_color</item>
@@ -342,25 +342,25 @@
         <item name="windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
     </style>
-    <style name="EnhancedBookmarkDialogWhite" parent="EnhancedBookmarkDialog">
+    <style name="BookmarkDialogWhite" parent="BookmarkDialog">
       <item name="android:windowBackground">@drawable/bg_white_dialog</item>
     </style>
-    <style name="EnhancedBookmarkTitleBarButton">
+    <style name="BookmarkTitleBarButton">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:background">@null</item>
         <item name="android:padding">15dp</item>
     </style>
-    <style name="EnhancedBookmarkMenuStyle" parent="Widget.AppCompat.ListPopupWindow">
+    <style name="BookmarkMenuStyle" parent="Widget.AppCompat.ListPopupWindow">
         <item name="android:popupBackground">@drawable/menu_bg</item>
     </style>
-    <style name="EnhancedBookmarkDrawerItemStyle">
+    <style name="BookmarkDrawerItemStyle">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">?android:attr/listPreferredItemHeightSmall</item>
         <item name="android:textAlignment">viewStart</item>
         <item name="android:gravity">start|center_vertical</item>
-        <item name="android:paddingStart">@dimen/enhanced_bookmark_drawer_drawable_padding</item>
-        <item name="android:paddingEnd">@dimen/enhanced_bookmark_drawer_drawable_padding</item>
+        <item name="android:paddingStart">@dimen/bookmark_drawer_drawable_padding</item>
+        <item name="android:paddingEnd">@dimen/bookmark_drawer_drawable_padding</item>
         <item name="android:singleLine">true</item>
         <item name="android:textAppearance">?android:attr/textAppearanceLargePopupMenu</item>
         <item name="android:textSize">14sp</item>