Rename EnhancedBookmarks to Bookmarks, part 2.

WATCHLISTS

 # Copyright (c) 2012 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.
 
 # Watchlist Rules
 # Refer: http://dev.chromium.org/developers/contributing-code/watchlists
 
 # IMPORTANT: The regular expression filepath is tested against each path using
 # re.search, so it is not usually necessary to add .*.
 
@@ skipping 322 matching lines @@
       'filepath': 'chrome/browser/chromeos/drive/resource_metadata'
     },
     'eme': {
       'filepath': 'components/cdm/|' \
                   'content/browser/media/cdm/|' \
                   'content/renderer/media/crypto/|' \
                   'media/base/android/*drm*|' \
                   'media/cdm/|' \
                   'third_party/widevine/cdm/'
     },
-    'enhanced_bookmarks_android': {
-      'filepath': 'chrome/android/java/src/org/chromium/'\
-                    'chrome/browser/enhancedbookmarks/|'\
-                  'chrome/android/java/res/layout/eb*.xml'
-    },
     'events': {
       'filepath': 'ui/events/',
     },
     'extension': {
       'filepath': 'extension',
     },
     'fileapi': {
       'filepath': 'file_system/|' \
                   'fileapi/'
     },
@@ skipping 1344 matching lines @@
                        'kinuko+worker@chromium.org',
                        'horo+watch@chromium.org',
                        'falken@chromium.org' ],
     'blink_wtf': [ 'mikhail.pozdnyakov@intel.com',
                    'blink-reviews-wtf@chromium.org' ],
     'blink_xmlhttprequest': [ 'tyoshino+watch@chromium.org' ],
     'test_runner': [ 'jochen+watch@chromium.org',
                      'mlamouri+watch-test-runner@chromium.org' ],
   },
 }