Refactor ShortcutHelper and merge in BookmarkUtils

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 8c70bbf7310f1b8206e3bc2dbd5fecda4f409276..df3e03798272e5b28a1ed467f33ca6be8b737a01 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -223,8 +223,6 @@
       'browser/android/rlz/revenue_stats.h',
       'browser/android/seccomp_support_detector.cc',
       'browser/android/seccomp_support_detector.h',
-      'browser/android/shortcut_data_fetcher.cc',
-      'browser/android/shortcut_data_fetcher.h',
       'browser/android/shortcut_helper.cc',
       'browser/android/shortcut_helper.h',
       'browser/android/shortcut_info.cc',
@@ -251,6 +249,10 @@
       'browser/android/warmup_manager.h',
       'browser/android/web_contents_factory.cc',
       'browser/android/web_contents_factory.h',
+      'browser/android/webapps/add_to_homescreen_data_fetcher.cc',
+      'browser/android/webapps/add_to_homescreen_data_fetcher.h',
+      'browser/android/webapps/add_to_homescreen_helper.cc',
+      'browser/android/webapps/add_to_homescreen_helper.h',
       'browser/android/webapps/single_tab_mode_tab_helper.cc',
       'browser/android/webapps/single_tab_mode_tab_helper.h',
       'browser/app_controller_mac.h',
@@ -1805,6 +1807,7 @@
       'android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java',
       'android/java/src/org/chromium/chrome/browser/ssl/ConnectionSecurity.java',
       'android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java',
+      'android/java/src/org/chromium/chrome/browser/webapps/AddToHomescreenHelper.java',
     ],
     'chrome_browser_mdns_sources': [
       'browser/local_discovery/privet_traffic_detector.cc',
@@ -3251,7 +3254,7 @@
             '../components/components.gyp:translate_content_browser',
             '../components/components.gyp:upload_list',
             '../components/components.gyp:url_matcher',
-            '../components/components.gyp:user_prefs_tracked', 
+            '../components/components.gyp:user_prefs_tracked',
             '../components/components.gyp:visitedlink_browser',
             '../components/components.gyp:visitedlink_common',
             '../components/components.gyp:web_cache_browser',