Rename EnhancedBookmarks to Bookmarks, part 2.

chrome/android/java/AndroidManifest.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. -->
 
 <!--
 Note: This is a jinja2 template, processed at build time into the final manifest.
 
 Blocks denoted with { % block some_name % }foo{ % endblock % } can be overridden
 by a child template that "extends" this file.
@@ skipping 260 matching lines @@
         <activity android:name="org.chromium.chrome.browser.EmbedContentViewActivity"
             android:theme="@style/ThemeWithActionBar"
             android:hardwareAccelerated="false"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc">
         </activity>
         <activity android:name="org.chromium.chrome.browser.prerender.PrerenderAPITestActivity"
             android:theme="@style/MainTheme"
             android:exported="true">
         </activity>
         <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkActivity"
-            android:theme="@style/EnhancedBookmarkDialog"
+            android:theme="@style/BookmarkDialog"
             android:windowSoftInputMode="stateAlwaysHidden"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc" >
         </activity>
         <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkAddActivity"
-            android:theme="@style/EnhancedBookmarkDialogWhite"
+            android:theme="@style/BookmarkDialogWhite"
             android:windowSoftInputMode="stateHidden"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc" >
             <intent-filter>
                 <action android:name="{{ manifest_package }}.ADDBOOKMARK" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkEditActivity"
-            android:theme="@style/EnhancedBookmarkDialogWhite"
+            android:theme="@style/BookmarkDialogWhite"
             android:windowSoftInputMode="stateHidden"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc" >
         </activity>
         <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkAddEditFolderActivity"
-            android:theme="@style/EnhancedBookmarkDialogWhite"
+            android:theme="@style/BookmarkDialogWhite"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc" >
         </activity>
         <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkFolderSelectActivity"
-            android:theme="@style/EnhancedBookmarkDialogWhite"
+            android:theme="@style/BookmarkDialogWhite"
             android:windowSoftInputMode="stateAlwaysHidden"
-            android:label="@string/enhanced_bookmark_choose_folder"
+            android:label="@string/bookmark_choose_folder"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc" >
         </activity>
         <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkSigninActivity"
-            android:theme="@style/EnhancedBookmarkDialogWhite"
+            android:theme="@style/BookmarkDialogWhite"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc" >
         </activity>
 
         <!--
             Activities for webapps.
             TODO(dfalcantara): Remove the aliases for the WebappActivities once we're pretty sure
                                that users don't have any instances of the original Activity still
                                running.
         -->
         <activity android:name="org.chromium.chrome.browser.webapps.WebappLauncherActivity"
@@ skipping 403 matching lines @@
              choose the first MediaRouteController that can play it, so the order of the list can be important.
              The most specific MediaRouteControllers should be listed first, followed by more generic ones.
              The downstream manifest replaces this block, and hence replaces the list of media route
              controllers with its own list. -->
         <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYERS"
             android:value="org.chromium.chrome.browser.media.remote.DefaultMediaRouteController"/>
 
         {% endblock %}
     </application>
 </manifest>