Rename EnhancedBookmarks to Bookmarks, part 2.

chrome/android/java/res/values/dimens.xml

 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2014 The Chromium Authors. All rights reserved.
      Use of this source code is governed by a BSD-style license that can be
      found in the LICENSE file. -->
 
 <resources>
     <!-- Connection info popup dimensions -->
     <dimen name="connection_info_padding_wide">24dp</dimen>
     <dimen name="connection_info_padding_thin">16dp</dimen>
 
@@ skipping 266 matching lines @@
     <dimen name="snackbar_tablet_width">450dp</dimen>
     <dimen name="snackbar_tablet_margin">24dp</dimen>
 
     <!-- Bookmarks widget dimensions -->
     <dimen name="widget_thumbnail_height">94dp</dimen>
     <dimen name="widget_horizontal_spacing">6dp</dimen>
     <dimen name="widget_vertical_spacing">6dp</dimen>
     <dimen name="widget_column_width">80dp</dimen>
     <dimen name="widget_favicon_size">16dp</dimen>
 
-    <!-- Enhanced bookmarks dimensions -->
-    <dimen name="enhanced_bookmark_item_corner_radius">3dp</dimen>
-    <dimen name="enhanced_bookmark_item_icon_text_size">10dp</dimen>
-    <dimen name="enhanced_bookmark_item_icon_size">16dp</dimen>
-    <dimen name="enhanced_bookmark_item_min_icon_size">16px</dimen>
-    <dimen name="enhanced_bookmark_item_popup_width">140dp</dimen>
-    <dimen name="enhanced_bookmark_folder_item_left">16dp</dimen>
-    <dimen name="enhanced_bookmark_minimum_dialog_size_tablet">500dp</dimen>
-    <dimen name="enhanced_bookmark_drawer_drawable_padding">18dp</dimen>
+    <!-- Bookmarks dimensions -->
+    <dimen name="bookmark_item_corner_radius">3dp</dimen>
+    <dimen name="bookmark_item_icon_text_size">10dp</dimen>
+    <dimen name="bookmark_item_icon_size">16dp</dimen>
+    <dimen name="bookmark_item_min_icon_size">16px</dimen>
+    <dimen name="bookmark_item_popup_width">140dp</dimen>
+    <dimen name="bookmark_folder_item_left">16dp</dimen>
+    <dimen name="bookmark_minimum_dialog_size_tablet">500dp</dimen>
+    <dimen name="bookmark_drawer_drawable_padding">18dp</dimen>
 
     <!-- Custom Tabs dimensions -->
     <dimen name="custom_tabs_toolbar_maxWidth">60dp</dimen>
     <dimen name="custom_tabs_toolbar_vertical_padding">16dp</dimen>
     <dimen name="toolbar_icon_height">24dp</dimen>
     <dimen name="min_toolbar_icon_side_padding">6dp</dimen>
     <dimen name="custom_tabs_url_text_size">12sp</dimen>
     <dimen name="custom_tabs_title_text_size">16sp</dimen>
 
     <!-- Favicon dimensions -->
     <dimen name="default_favicon_size">16dp</dimen>
 
     <!-- Media UI dimensions -->
     <!-- The media_session_icon_size is just big enough to make sure Android doesn't discard the
          icon but otherwise, the icon is meant to be a flat color so it doesn't really matter. -->
     <dimen name="media_session_icon_size">48dp</dimen>
 
     <!-- Offline pages dimensions -->
     <dimen name="offline_page_item_vertical_spacing">16dp</dimen>
 
     <!-- Account chooser dialog dimensions -->
     <dimen name="account_chooser_dialog_margin">24dp</dimen>
     <dimen name="account_chooser_dialog_item_margin">20dp</dimen>
     <dimen name="account_chooser_dialog_title_main_text_size">18sp</dimen>
     <dimen name="account_chooser_dialog_title_descriptive_text_size">16sp</dimen>
 </resources>