Rename EnhancedBookmarks to Bookmarks, part 2.

chrome/android/java/res/layout/bookmark_add_edit_folder_activity.xml

 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2015 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. -->
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:chrome="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:minHeight="@dimen/enhanced_bookmark_minimum_dialog_size_tablet"
+    android:minHeight="@dimen/bookmark_minimum_dialog_size_tablet"
     android:orientation="vertical" >
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:background="?attr/colorPrimary" />
 
     <View
         android:layout_width="match_parent"
         android:layout_height="4dp"
         android:layout_marginBottom="-4dp"
-        android:background="@drawable/eb_title_bar_shadow" />
+        android:background="@drawable/bookmark_title_bar_shadow" />
 
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:clipToPadding="false" >
@@ skipping 11 matching lines @@
                 android:textSize="24sp"
                 chrome:alertMessage="@string/bookmark_missing_title"  />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="4dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginStart="16dp"
                 android:layout_marginTop="24dp"
-                android:text="@string/enhanced_bookmark_parent_folder"
-                android:textColor="@color/enhanced_bookmark_detail_section"
+                android:text="@string/bookmark_parent_folder"
+                android:textColor="@color/bookmark_detail_section"
                 android:textSize="14sp"
                 android:textStyle="bold" />
 
             <TextView
                 android:id="@+id/parent_folder"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="32dp"
                 android:textColor="@color/dark_mode_tint"
                 android:textSize="16sp" />
         </LinearLayout>
     </ScrollView>
 
 </LinearLayout>