Merge chrome/browser/android/bookmark[s] folders.

chrome/chrome_browser.gypi

 # Copyright 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.
 
 {
   'variables': {
     # All .cc, .h, .m, and .mm files under browser except for:
     # * tests and mocks.
     # * code below browser/chromeos
     # * code below browser/extensions
@@ skipping 18 matching lines @@
       'browser/android/activity_type_ids.cc',
       'browser/android/activity_type_ids.h',
       'browser/android/appmenu/app_menu_drag_helper.cc',
       'browser/android/appmenu/app_menu_drag_helper.h',
       'browser/android/banners/app_banner_data_fetcher_android.cc',
       'browser/android/banners/app_banner_data_fetcher_android.h',
       'browser/android/banners/app_banner_infobar_delegate_android.cc',
       'browser/android/banners/app_banner_infobar_delegate_android.h',
       'browser/android/banners/app_banner_manager_android.cc',
       'browser/android/banners/app_banner_manager_android.h',
-      'browser/android/bookmark/edit_bookmark_helper.cc',
-      'browser/android/bookmark/edit_bookmark_helper.h',
       'browser/android/bookmarks/bookmarks_bridge.cc',
       'browser/android/bookmarks/bookmarks_bridge.h',
+      'browser/android/bookmarks/edit_bookmark_helper.cc',
+      'browser/android/bookmarks/edit_bookmark_helper.h',
       'browser/android/bookmarks/partner_bookmarks_reader.cc',
       'browser/android/bookmarks/partner_bookmarks_reader.h',
       'browser/android/bookmarks/partner_bookmarks_shim.cc',
       'browser/android/bookmarks/partner_bookmarks_shim.h',
       'browser/android/chrome_application.cc',
       'browser/android/chrome_application.h',
       'browser/android/chrome_jni_registrar.cc',
       'browser/android/chrome_jni_registrar.h',
       'browser/android/chrome_main_delegate_staging_android.cc',
       'browser/android/chrome_main_delegate_staging_android.h',
@@ skipping 4059 matching lines @@
             '../components/components.gyp:omnibox_browser',
             '../components/components.gyp:rlz',
             '../components/components.gyp:search_engines',
             '../rlz/rlz.gyp:rlz_lib',
           ],
         },
       ],
     }],
   ],
 }