Re-engineer edit screen in enhanced bookmark

chrome/android/java_staging/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 261 matching lines @@
         </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.enhancedbookmarks.EnhancedBookmarkActivity"
             android:theme="@style/EnhancedBookmarkDialogWhite"
             android:windowSoftInputMode="stateHidden"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc" >
         </activity>
-        <activity android:name="org.chromium.chrome.browser.enhancedbookmarks.EnhancedBookmarkDetailActivity"
+        <activity android:name="org.chromium.chrome.browser.enhancedbookmarks.EnhancedBookmarkEditActivity"
             android:theme="@style/EnhancedBookmarkDialogWhite"
+            android:label="@string/edit_bookmark"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc" >
         </activity>
         <activity android:name="org.chromium.chrome.browser.enhancedbookmarks.EnhancedBookmarkAddEditFolderActivity"
             android:theme="@style/EnhancedBookmarkDialogWhite"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc" >
         </activity>
         <activity android:name="org.chromium.chrome.browser.enhancedbookmarks.EnhancedBookmarkFolderSelectActivity"
             android:theme="@style/EnhancedBookmarkDialogWhite"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc" >
         </activity>
@@ skipping 289 matching lines @@
 
         <meta-data android:name="org.chromium.content.browser.SMART_CLIP_PROVIDER"
             android:value="org.chromium.content.browser.SmartClipProvider"/>
         <meta-data android:name="org.chromium.components.service_tab_launcher.SERVICE_TAB_LAUNCHER"
                    android:value="org.chromium.chrome.browser.ChromeServiceTabLauncher" />
 
         {% block extra_application_definitions %}
         {% endblock %}
     </application>
 </manifest>