Rename EnhancedBookmarks to Bookmarks, part 2.

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

Index: chrome/android/java/res/layout/bookmark_folder_select_activity.xml
diff --git a/chrome/android/java/res/layout/eb_folder_select_activity.xml b/chrome/android/java/res/layout/bookmark_folder_select_activity.xml
similarity index 85%
rename from chrome/android/java/res/layout/eb_folder_select_activity.xml
rename to chrome/android/java/res/layout/bookmark_folder_select_activity.xml
index bdaa9b95bd1b851c0ad6eb65d0c251acefa4227c..eaa7953025631c3cbfff1d447b51cc539f82a9a7 100644
--- a/chrome/android/java/res/layout/eb_folder_select_activity.xml
+++ b/chrome/android/java/res/layout/bookmark_folder_select_activity.xml
@@ -6,7 +6,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     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
@@ -19,10 +19,10 @@
         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" />
 
     <ListView
-        android:id="@+id/eb_folder_list"
+        android:id="@+id/bookmark_folder_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:paddingBottom="8dp"