Merge libchrome_staging target into browser.

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 19 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/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_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',
       'browser/android/chrome_media_client_android.cc',
       'browser/android/chrome_media_client_android.h',
       'browser/android/chrome_startup_flags.cc',
       'browser/android/chrome_startup_flags.h',
       'browser/android/chrome_web_contents_delegate_android.cc',
       'browser/android/chrome_web_contents_delegate_android.h',
       'browser/android/chromium_application.cc',
       'browser/android/chromium_application.h',
+      'browser/android/compositor/compositor_view.cc',
+      'browser/android/compositor/compositor_view.h',
       'browser/android/compositor/decoration_title.cc',
       'browser/android/compositor/decoration_title.h',
       'browser/android/compositor/layer/content_layer.cc',
       'browser/android/compositor/layer/content_layer.h',
       'browser/android/compositor/layer/contextual_search_layer.cc',
       'browser/android/compositor/layer/contextual_search_layer.h',
       'browser/android/compositor/layer/layer.h',
+      'browser/android/compositor/layer/reader_mode_layer.cc',
+      'browser/android/compositor/layer/reader_mode_layer.h',
+      'browser/android/compositor/layer/tab_handle_layer.cc',
+      'browser/android/compositor/layer/tab_handle_layer.h',
       'browser/android/compositor/layer/tab_layer.cc',
       'browser/android/compositor/layer/tab_layer.h',
       'browser/android/compositor/layer/throbber_layer.cc',
       'browser/android/compositor/layer/throbber_layer.h',
       'browser/android/compositor/layer/thumbnail_layer.cc',
       'browser/android/compositor/layer/thumbnail_layer.h',
       'browser/android/compositor/layer/toolbar_layer.cc',
       'browser/android/compositor/layer/toolbar_layer.h',
       'browser/android/compositor/layer_title_cache.cc',
       'browser/android/compositor/layer_title_cache.h',
+      'browser/android/compositor/scene_layer/contextual_search_scene_layer.cc',
+      'browser/android/compositor/scene_layer/contextual_search_scene_layer.h',
+      'browser/android/compositor/scene_layer/reader_mode_scene_layer.cc',
+      'browser/android/compositor/scene_layer/reader_mode_scene_layer.h',
       'browser/android/compositor/scene_layer/scene_layer.cc',
       'browser/android/compositor/scene_layer/scene_layer.h',
       'browser/android/compositor/scene_layer/static_tab_scene_layer.cc',
       'browser/android/compositor/scene_layer/static_tab_scene_layer.h',
+      'browser/android/compositor/scene_layer/tab_list_scene_layer.cc',
+      'browser/android/compositor/scene_layer/tab_list_scene_layer.h',
+      'browser/android/compositor/scene_layer/tab_strip_scene_layer.cc',
+      'browser/android/compositor/scene_layer/tab_strip_scene_layer.h',
       'browser/android/compositor/tab_content_manager.cc',
       'browser/android/compositor/tab_content_manager.h',
+      'browser/android/contextualsearch/contextual_search_context.cc',
+      'browser/android/contextualsearch/contextual_search_context.h',
+      'browser/android/contextualsearch/contextual_search_delegate.cc',
+      'browser/android/contextualsearch/contextual_search_delegate.h',
+      'browser/android/contextualsearch/contextual_search_manager.cc',
+      'browser/android/contextualsearch/contextual_search_manager.h',
+      'browser/android/contextualsearch/contextual_search_tab_helper.cc',
+      'browser/android/contextualsearch/contextual_search_tab_helper.h',
       'browser/android/cookies/cookies_fetcher.cc',
       'browser/android/cookies/cookies_fetcher.h',
       'browser/android/dev_tools_discovery_provider_android.cc',
       'browser/android/dev_tools_discovery_provider_android.h',
       'browser/android/dev_tools_server.cc',
       'browser/android/dev_tools_server.h',
+      'browser/android/document/document_web_contents_delegate.cc',
       'browser/android/dom_distiller/external_feedback_reporter_android.cc',
       'browser/android/dom_distiller/external_feedback_reporter_android.h',
       'browser/android/download/android_download_manager_overwrite_infobar_delegate.cc',
       'browser/android/download/android_download_manager_overwrite_infobar_delegate.h',
       'browser/android/download/chrome_download_delegate.cc',
       'browser/android/download/chrome_download_delegate.h',
       'browser/android/download/chrome_download_manager_overwrite_infobar_delegate.cc',
       'browser/android/download/chrome_download_manager_overwrite_infobar_delegate.h',
       'browser/android/download/download_overwrite_infobar_delegate.cc',
       'browser/android/download/download_overwrite_infobar_delegate.h',
@@ skipping 85 matching lines @@
       'browser/android/provider/bookmark_model_observer_task.cc',
       'browser/android/provider/bookmark_model_observer_task.h',
       'browser/android/provider/chrome_browser_provider.cc',
       'browser/android/provider/chrome_browser_provider.h',
       'browser/android/provider/run_on_ui_thread_blocking.h',
       'browser/android/recently_closed_tabs_bridge.cc',
       'browser/android/recently_closed_tabs_bridge.h',
       'browser/android/resource_id.h',
       'browser/android/resource_mapper.cc',
       'browser/android/resource_mapper.h',
+      'browser/android/rlz/revenue_stats.cc',
+      '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',
       'browser/android/shortcut_info.h',
       'browser/android/signin/account_management_screen_helper.cc',
       'browser/android/signin/account_management_screen_helper.h',
       'browser/android/signin/signin_manager_android.cc',
       'browser/android/signin/signin_manager_android.h',
+      'browser/android/staging_jni_registrar.cc',
+      'browser/android/staging_jni_registrar.h',
       'browser/android/tab/background_content_view_helper.cc',
       'browser/android/tab/background_content_view_helper.h',
+      'browser/android/tab/thumbnail_tab_helper_android.cc',
+      'browser/android/tab/thumbnail_tab_helper_android.h',
       'browser/android/tab_android.cc',
       'browser/android/tab_android.h',
       'browser/android/tab_load_status.h',
       'browser/android/tab_state.cc',
       'browser/android/tab_state.h',
       'browser/android/thumbnail/thumbnail.cc',
       'browser/android/thumbnail/thumbnail.h',
       'browser/android/thumbnail/thumbnail_cache.cc',
       'browser/android/thumbnail/thumbnail_cache.h',
       'browser/android/url_utilities.cc',
@@ skipping 1554 matching lines @@
       'android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBarDelegate.java',
       'android/java/src/org/chromium/chrome/browser/infobar/DataReductionProxyInfoBarDelegate.java',
       'android/java/src/org/chromium/chrome/browser/infobar/GeneratedPasswordSavedInfoBarDelegate.java',
       'android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java',
       'android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainer.java',
       'android/java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java',
       'android/java/src/org/chromium/chrome/browser/invalidation/InvalidationServiceFactory.java',
       '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_staging/src/org/chromium/chrome/browser/bookmark/EditBookmarkHelper.java',
+      'android/java_staging/src/org/chromium/chrome/browser/compositor/CompositorView.java',
+      'android/java_staging/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java',
+      'android/java_staging/src/org/chromium/chrome/browser/compositor/scene_layer/ReaderModeSceneLayer.java',
+      'android/java_staging/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java',
+      'android/java_staging/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java',
+      'android/java_staging/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java',
+      'android/java_staging/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTabHelper.java',
+      'android/java_staging/src/org/chromium/chrome/browser/document/DocumentWebContentsDelegate.java',
+      'android/java_staging/src/org/chromium/chrome/browser/rlz/RevenueStats.java',
+      'android/java_staging/src/org/chromium/chrome/browser/tab/ThumbnailTabHelper.java',
     ],
     'chrome_browser_mdns_sources': [
       'browser/local_discovery/privet_traffic_detector.cc',
       'browser/local_discovery/privet_traffic_detector.h',
       'browser/local_discovery/service_discovery_client_mdns.cc',
       'browser/local_discovery/service_discovery_client_mdns.h',
       'browser/local_discovery/service_discovery_client_utility.cc',
       'browser/local_discovery/service_discovery_client_utility.h',
       'browser/local_discovery/service_discovery_host_client.cc',
       'browser/local_discovery/service_discovery_host_client.h',
@@ skipping 602 matching lines @@
       'browser/rlz/rlz.cc',
       'browser/rlz/rlz.h',
       'browser/rlz/rlz_chromeos.cc',
       'browser/rlz/rlz_ios.mm',
       'browser/rlz/rlz_mac.cc',
       'browser/rlz/rlz_win.cc',
     ],
     # "Safe Browsing Basic" files used for safe browsing in full mode
     # (safe_browsing=1), mobile (=2), and mobile-extended (=3).
     'chrome_browser_safe_browsing_basic_sources': [
+      'browser/android/spdy_proxy_resource_throttle.cc',

[newt (away), 2015/06/19 02:06:23]

bengr: where should these source files be listed? Also, should these files live
in browser/android or browser/safe_browsing?

[bengr, 2015/06/22 20:50:29]

Good question. This is code that was written for Android, but that could be used
by any platform, but probably won't be.

browser/safe_browsing and browser/net/spdyproxy seem like ok places, the latter
is where we've been dumping things so it's preferred slightly.

References to spdy_proxy should probably be changed to data_reduction_proxy. 

+      'browser/android/spdy_proxy_resource_throttle.h',
+
       'browser/renderer_host/safe_browsing_resource_throttle_factory.cc',
       'browser/renderer_host/safe_browsing_resource_throttle_factory.h',
       'browser/safe_browsing/malware_details.cc',
       'browser/safe_browsing/malware_details.h',
       'browser/safe_browsing/malware_details_cache.cc',
       'browser/safe_browsing/malware_details_cache.h',
       'browser/safe_browsing/malware_details_history.cc',
       'browser/safe_browsing/malware_details_history.h',
       'browser/safe_browsing/ping_manager.cc',
       'browser/safe_browsing/ping_manager.h',
@@ skipping 1596 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' ]
         },
       ],
     },],
   ],
 }