Merge from Chromium at DEPS revision 257591

This commit was generated by merge_to_master.py.

Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5

1 files changed, 89 insertions, 6 deletions

diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
index 1045e535d1..b13f128499 100644
--- a/extensions/extensions.gyp
+++ b/extensions/extensions.gyp
@@ -11,6 +11,7 @@
       'target_name': 'extensions_common',
       'type': 'static_library',
       'dependencies': [
+        'common/api/api.gyp:extensions_api',
         '../third_party/re2/re2.gyp:re2',
         # TODO(benwells): figure out what to do with the api target and
         # api resources compiled into the chrome resource bundle.
@@ -18,7 +19,7 @@
         '../chrome/chrome_resources.gyp:chrome_resources',
         # TODO(jamescook|derat): Pull strings into extensions module.
         '../chrome/chrome_resources.gyp:chrome_strings',
-        '../chrome/common/extensions/api/api.gyp:api',
+        '../chrome/common/extensions/api/api.gyp:chrome_api',
         '../components/components.gyp:url_matcher',
         '../content/content.gyp:content_common',
       ],
@@ -48,6 +49,10 @@
         'common/extension_api.cc',
         'common/extension_api.h',
         'common/extension_api_stub.cc',
+        'common/extension_message_generator.cc',
+        'common/extension_message_generator.h',
+        'common/extension_messages.cc',
+        'common/extension_messages.h',
         'common/extension_paths.cc',
         'common/extension_paths.h',
         'common/extension_resource.cc',
@@ -152,9 +157,10 @@
         'extensions_common',
         # TODO(jamescook|derat): Pull strings into extensions module.
         '../chrome/chrome_resources.gyp:chrome_strings',
-        '../chrome/common/extensions/api/api.gyp:api',
+        '../chrome/common/extensions/api/api.gyp:chrome_api',
         '../content/content.gyp:content_browser',
         '../skia/skia.gyp:skia',
+        '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
       ],
       'include_dirs': [
         '..',
@@ -167,9 +173,57 @@
       'sources': [
         'browser/admin_policy.cc',
         'browser/admin_policy.h',
+        # NOTE: When moving an API out of Chrome be sure to verify that the
+        # Android build still compiles. See conditions below.
+        'browser/api/api_resource.cc',
+        'browser/api/api_resource.h',
+        'browser/api/api_resource_manager.h',
+        'browser/api/async_api_function.cc',
+        'browser/api/async_api_function.h',
+        'browser/api/extensions_api_client.cc',
+        'browser/api/extensions_api_client.h',
+        'browser/api/socket/socket.cc',
+        'browser/api/socket/socket.h',
+        'browser/api/socket/socket_api.cc',
+        'browser/api/socket/socket_api.h',
+        'browser/api/socket/tcp_socket.cc',
+        'browser/api/socket/tcp_socket.h',
+        'browser/api/socket/udp_socket.cc',
+        'browser/api/socket/udp_socket.h',
+        'browser/api/sockets_tcp/sockets_tcp_api.cc',
+        'browser/api/sockets_tcp/sockets_tcp_api.h',
+        'browser/api/sockets_tcp/tcp_socket_event_dispatcher.cc',
+        'browser/api/sockets_tcp/tcp_socket_event_dispatcher.h',
+        'browser/api/sockets_tcp_server/sockets_tcp_server_api.cc',
+        'browser/api/sockets_tcp_server/sockets_tcp_server_api.h',
+        'browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.cc',
+        'browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.h',
+        'browser/api/sockets_udp/sockets_udp_api.cc',
+        'browser/api/sockets_udp/sockets_udp_api.h',
+        'browser/api/sockets_udp/udp_socket_event_dispatcher.cc',
+        'browser/api/sockets_udp/udp_socket_event_dispatcher.h',
+        'browser/api/storage/leveldb_settings_storage_factory.cc',
+        'browser/api/storage/leveldb_settings_storage_factory.h',
+        'browser/api/storage/local_value_store_cache.cc',
+        'browser/api/storage/local_value_store_cache.h',
+        'browser/api/storage/settings_namespace.cc',
+        'browser/api/storage/settings_namespace.h',
+        'browser/api/storage/settings_observer.h',
+        'browser/api/storage/settings_storage_factory.h',
+        'browser/api/storage/settings_storage_quota_enforcer.cc',
+        'browser/api/storage/settings_storage_quota_enforcer.h',
+        'browser/api/storage/storage_api.cc',
+        'browser/api/storage/storage_api.h',
+        'browser/api/storage/storage_frontend.cc',
+        'browser/api/storage/storage_frontend.h',
+        'browser/api/storage/value_store_cache.cc',
+        'browser/api/storage/value_store_cache.h',
+        'browser/api/storage/weak_unlimited_settings_storage.cc',
+        'browser/api/storage/weak_unlimited_settings_storage.h',
         'browser/api_activity_monitor.h',
         'browser/app_sorting.h',
         'browser/blacklist_state.h',
+        'browser/browser_context_keyed_api_factory.h',
         'browser/error_map.cc',
         'browser/error_map.h',
         'browser/event_listener_map.cc',
@@ -180,6 +234,12 @@
         'browser/extension_error.h',
         'browser/extension_function.cc',
         'browser/extension_function.h',
+        'browser/extension_function_dispatcher.cc',
+        'browser/extension_function_dispatcher.h',
+        'browser/extension_function_registry.cc',
+        'browser/extension_function_registry.h',
+        'browser/extension_function_util.cc',
+        'browser/extension_function_util.h',
         'browser/extension_message_filter.cc',
         'browser/extension_message_filter.h',
         'browser/extension_pref_store.cc',
@@ -216,10 +276,6 @@
         'browser/lazy_background_task_queue.h',
         'browser/management_policy.cc',
         'browser/management_policy.h',
-        'browser/pending_extension_info.cc',
-        'browser/pending_extension_info.h',
-        'browser/pending_extension_manager.cc',
-        'browser/pending_extension_manager.h',
         'browser/pref_names.cc',
         'browser/pref_names.h',
         'browser/process_manager.cc',
@@ -235,9 +291,33 @@
         'browser/runtime_data.cc',
         'browser/runtime_data.h',
         'browser/update_observer.h',
+        'browser/value_store/leveldb_value_store.cc',
+        'browser/value_store/leveldb_value_store.h',
+        'browser/value_store/testing_value_store.cc',
+        'browser/value_store/testing_value_store.h',
+        'browser/value_store/value_store.cc',
+        'browser/value_store/value_store.h',
+        'browser/value_store/value_store_change.cc',
+        'browser/value_store/value_store_change.h',
+        'browser/value_store/value_store_frontend.cc',
+        'browser/value_store/value_store_frontend.h',
+        'browser/value_store/value_store_util.cc',
+        'browser/value_store/value_store_util.h',
         'browser/view_type_utils.cc',
         'browser/view_type_utils.h',
       ],
+      'conditions': [
+        ['enable_extensions==0', {
+          # Exclude all API implementations and the ExtensionsApiClient
+          # interface. Moving an API from src/chrome to src/extensions implies
+          # it can be cleanly disabled with enable_extensions==0.
+          # TODO: Eventually the entire extensions module should not be built
+          # when enable_extensions==0.
+          'sources/': [
+            ['exclude', '^browser/api/'],
+          ],
+        }],
+      ],
       # Disable c4267 warnings until we fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4267, ],
     },
@@ -248,11 +328,14 @@
         'extensions_browser',
         'extensions_common',
         '../base/base.gyp:base',
+        '../testing/gtest.gyp:gtest',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
+        'browser/test_extensions_browser_client.cc',
+        'browser/test_extensions_browser_client.h',
         'browser/test_management_policy.cc',
         'browser/test_management_policy.h',
         'common/extension_builder.cc',