Revert "Revert of Refactor get_salient_image_url.js to use DocumentImageExtractor"

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 1300 matching lines @@
       'browser/bookmarks/bookmark_model_factory.cc',
       'browser/bookmarks/bookmark_model_factory.h',
       'browser/bookmarks/bookmark_stats.cc',
       'browser/bookmarks/bookmark_stats.h',
       'browser/bookmarks/chrome_bookmark_client.cc',
       'browser/bookmarks/chrome_bookmark_client.h',
       'browser/bookmarks/chrome_bookmark_client_factory.cc',
       'browser/bookmarks/chrome_bookmark_client_factory.h',
       'browser/bookmarks/enhanced_bookmarks_features.cc',
       'browser/bookmarks/enhanced_bookmarks_features.h',
+      'browser/enhanced_bookmarks/chrome_bookmark_server_cluster_service.cc',
+      'browser/enhanced_bookmarks/chrome_bookmark_server_cluster_service.h',
+      'browser/enhanced_bookmarks/chrome_bookmark_server_cluster_service_factory.cc',
+      'browser/enhanced_bookmarks/chrome_bookmark_server_cluster_service_factory.h',
+      'browser/enhanced_bookmarks/enhanced_bookmark_model_factory.cc',
+      'browser/enhanced_bookmarks/enhanced_bookmark_model_factory.h',
+    ],
+    'chrome_browser_bookmark_android_sources': [
       'browser/enhanced_bookmarks/android/bookmark_image_service_android.cc',
       'browser/enhanced_bookmarks/android/bookmark_image_service_android.h',
       'browser/enhanced_bookmarks/android/bookmark_image_service_factory.cc',
       'browser/enhanced_bookmarks/android/bookmark_image_service_factory.h',
       'browser/enhanced_bookmarks/android/enhanced_bookmark_tab_helper.cc',
       'browser/enhanced_bookmarks/android/enhanced_bookmark_tab_helper.h',
       'browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.cc',
       'browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.h',
-      'browser/enhanced_bookmarks/chrome_bookmark_server_cluster_service.cc',
-      'browser/enhanced_bookmarks/chrome_bookmark_server_cluster_service.h',
-      'browser/enhanced_bookmarks/chrome_bookmark_server_cluster_service_factory.cc',
-      'browser/enhanced_bookmarks/chrome_bookmark_server_cluster_service_factory.h',
-      'browser/enhanced_bookmarks/enhanced_bookmark_model_factory.cc',
-      'browser/enhanced_bookmarks/enhanced_bookmark_model_factory.h',
     ],
     'chrome_browser_browser_process_sources': [
       'browser/browser_process.cc',
       'browser/browser_process.h',
       'browser/browser_process_impl.cc',
       'browser/browser_process_impl.h',
       'browser/browser_process_platform_part.h',
       'browser/browser_process_platform_part_android.cc',
       'browser/browser_process_platform_part_android.h',
       'browser/browser_process_platform_part_base.cc',
@@ skipping 2232 matching lines @@
         }],
         ['OS=="android"', {
           'dependencies': [
             '../build/android/ndk.gyp:cpu_features',
             '../components/components.gyp:cdm_browser',
             '../components/components.gyp:data_reduction_proxy_content',
             '../components/components.gyp:enhanced_bookmarks',
             '../components/components.gyp:service_tab_launcher',
             '../components/components.gyp:web_contents_delegate_android',
             '../components/components_resources.gyp:components_resources',
+            '../components/resources/enhanced_bookmarks/enhanced_bookmarks.gypi:*',
+            '../components/resources/enhanced_bookmarks/enhanced_bookmarks_resources.gyp:*',
             '../third_party/android_opengl/etc1/etc1.gyp:etc1',
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_util',
             'chrome_browser_jni_headers',
             'client_discourse_context_proto',
             'delta_file_proto',
           ],
           'dependencies!': [
             '../components/components.gyp:storage_monitor',
             '../components/components.gyp:web_modal',
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',
           ],
-          'sources': [ '<@(chrome_browser_android_sources)' ],
+          'sources': [
+            '<@(chrome_browser_android_sources)',
+            '<@(chrome_browser_bookmark_android_sources)',
+           ],
           'defines': [ 'ENABLE_DATA_REDUCTION_PROXY_DEBUGGING' ],
           'conditions': [
             ['use_seccomp_bpf==1', {
               'defines': ['USE_SECCOMP_BPF'],
             }],
           ],
         }],
         ['OS=="mac"', {
           'dependencies': [
             '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac',
@@ skipping 369 matching lines @@
           'variables': {
             'proto_in_dir': 'browser/sync_file_system/drive_backend',
             'proto_out_dir': 'chrome/browser/sync_file_system/drive_backend',
           },
           'includes': [ '../build/protoc.gypi' ]
         },
       ],
     },],
   ],
 }