Revert 132589 - Revert 132440 - Allow extension APIs to be compiled out.

BUG=117407,123835
TEST=


Review URL: http://codereview.chromium.org/10031002

TBR=jgreenwald@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10107026

TBR=zmo@google.com
Review URL: https://chromiumcodereview.appspot.com/10106026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132591 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 83 insertions, 48 deletions

diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index 3726d46..e22fe32 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -197,28 +197,18 @@
         'browser/extensions/default_apps.h',
         'browser/extensions/default_apps_trial.cc',
         'browser/extensions/default_apps_trial.h',
-        'browser/extensions/execute_code_in_tab_function.cc',
-        'browser/extensions/execute_code_in_tab_function.h',
         'browser/extensions/extension_activity_log.cc',
         'browser/extensions/extension_activity_log.h',
         'browser/extensions/extension_browser_event_router.cc',
         'browser/extensions/extension_browser_event_router.h',
-        'browser/extensions/extension_chrome_auth_private_api.cc',
-        'browser/extensions/extension_chrome_auth_private_api.h',
-        'browser/extensions/extension_content_settings_api.cc',
-        'browser/extensions/extension_content_settings_api.h',
         'browser/extensions/extension_content_settings_api_constants.cc',
         'browser/extensions/extension_content_settings_api_constants.h',
         'browser/extensions/extension_content_settings_helpers.cc',
         'browser/extensions/extension_content_settings_helpers.h',
         'browser/extensions/extension_content_settings_store.cc',
         'browser/extensions/extension_content_settings_store.h',
-        'browser/extensions/extension_context_menu_api.cc',
-        'browser/extensions/extension_context_menu_api.h',
         'browser/extensions/extension_context_menu_model.cc',
         'browser/extensions/extension_context_menu_model.h',
-        'browser/extensions/extension_cookies_api.cc',
-        'browser/extensions/extension_cookies_api.h',
         'browser/extensions/extension_cookies_api_constants.cc',
         'browser/extensions/extension_cookies_api_constants.h',
         'browser/extensions/extension_cookies_helpers.cc',
@@ -229,8 +219,6 @@
         'browser/extensions/extension_creator_filter.h',
         'browser/extensions/extension_data_deleter.cc',
         'browser/extensions/extension_data_deleter.h',
-        'browser/extensions/extension_debugger_api.cc',
-        'browser/extensions/extension_debugger_api.h',
         'browser/extensions/extension_debugger_api_constants.cc',
         'browser/extensions/extension_debugger_api_constants.h',
         'browser/extensions/extension_devtools_bridge.cc',
@@ -249,8 +237,6 @@
         'browser/extensions/extension_event_router.h',
         'browser/extensions/extension_event_router_forwarder.cc',
         'browser/extensions/extension_event_router_forwarder.h',
-        'browser/extensions/extension_font_settings_api.cc',
-        'browser/extensions/extension_font_settings_api.h',
         'browser/extensions/extension_function.cc',
         'browser/extensions/extension_function.h',
         'browser/extensions/extension_function_dispatcher.cc',
@@ -265,12 +251,8 @@
         'browser/extensions/extension_host.h',
         'browser/extensions/extension_host_mac.h',
         'browser/extensions/extension_host_mac.mm',
-        'browser/extensions/extension_i18n_api.cc',
-        'browser/extensions/extension_i18n_api.h',
         'browser/extensions/extension_icon_manager.cc',
         'browser/extensions/extension_icon_manager.h',
-        'browser/extensions/extension_idle_api.cc',
-        'browser/extensions/extension_idle_api.h',
         'browser/extensions/extension_idle_api_constants.cc',
         'browser/extensions/extension_idle_api_constants.h',
         'browser/extensions/extension_info_map.cc',
@@ -279,26 +261,14 @@
         'browser/extensions/extension_info_private_api_chromeos.h',
         'browser/extensions/extension_infobar_delegate.cc',
         'browser/extensions/extension_infobar_delegate.h',
-        'browser/extensions/extension_input_api.cc',
-        'browser/extensions/extension_input_api.h',
-        'browser/extensions/extension_input_ime_api.cc',
-        'browser/extensions/extension_input_ime_api.h',
-        'browser/extensions/extension_input_method_api.cc',
-        'browser/extensions/extension_input_method_api.h',
         'browser/extensions/extension_input_module_constants.cc',
         'browser/extensions/extension_input_module_constants.h',
-        'browser/extensions/extension_input_ui_api.cc',
-        'browser/extensions/extension_input_ui_api.h',
         'browser/extensions/extension_install_dialog.cc',
         'browser/extensions/extension_install_dialog.h',
         'browser/extensions/extension_install_ui.cc',
         'browser/extensions/extension_install_ui.h',
         'browser/extensions/extension_keybinding_registry.cc',
         'browser/extensions/extension_keybinding_registry.h',
-        'browser/extensions/extension_managed_mode_api.cc',
-        'browser/extensions/extension_managed_mode_api.h',
-        'browser/extensions/extension_management_api.cc',
-        'browser/extensions/extension_management_api.h',
         'browser/extensions/extension_management_api_constants.cc',
         'browser/extensions/extension_management_api_constants.h',
         'browser/extensions/extension_menu_manager.cc',
@@ -307,24 +277,18 @@
         'browser/extensions/extension_message_handler.h',
         'browser/extensions/extension_message_service.cc',
         'browser/extensions/extension_message_service.h',
-        'browser/extensions/extension_metrics_module.cc',
-        'browser/extensions/extension_metrics_module.h',
         'browser/extensions/extension_module.cc',
         'browser/extensions/extension_module.h',
         'browser/extensions/extension_navigation_observer.cc',
         'browser/extensions/extension_navigation_observer.h',
         'browser/extensions/extension_omnibox_api.cc',
         'browser/extensions/extension_omnibox_api.h',
-        'browser/extensions/extension_page_capture_api.cc',
-        'browser/extensions/extension_page_capture_api.h',
         'browser/extensions/extension_pref_store.cc',
         'browser/extensions/extension_pref_store.h',
         'browser/extensions/extension_pref_value_map.cc',
         'browser/extensions/extension_pref_value_map.h',
         'browser/extensions/extension_pref_value_map_factory.cc',
         'browser/extensions/extension_pref_value_map_factory.h',
-        'browser/extensions/extension_preference_api.cc',
-        'browser/extensions/extension_preference_api.h',
         'browser/extensions/extension_preference_api_constants.cc',
         'browser/extensions/extension_preference_api_constants.h',
         'browser/extensions/extension_preference_helpers.cc',
@@ -363,12 +327,8 @@
         'browser/extensions/extension_tab_id_map.h',
         'browser/extensions/extension_tab_util.cc',
         'browser/extensions/extension_tab_util.h',
-        'browser/extensions/extension_tabs_module.cc',
-        'browser/extensions/extension_tabs_module.h',
         'browser/extensions/extension_tabs_module_constants.cc',
         'browser/extensions/extension_tabs_module_constants.h',
-        'browser/extensions/extension_test_api.cc',
-        'browser/extensions/extension_test_api.h',
         'browser/extensions/extension_toolbar_model.cc',
         'browser/extensions/extension_toolbar_model.h',
         'browser/extensions/extension_uninstall_dialog.cc',
@@ -379,14 +339,10 @@
         'browser/extensions/extension_window_controller.h',
         'browser/extensions/extension_window_list.cc',
         'browser/extensions/extension_window_list.h',
-        'browser/extensions/extension_web_socket_proxy_private_api.cc',
-        'browser/extensions/extension_web_socket_proxy_private_api.h',
         'browser/extensions/extension_web_ui.cc',
         'browser/extensions/extension_web_ui.h',
         'browser/extensions/extension_webkit_preferences.cc',
         'browser/extensions/extension_webkit_preferences.h',
-        'browser/extensions/extension_webstore_private_api.cc',
-        'browser/extensions/extension_webstore_private_api.h',
         'browser/extensions/extensions_quota_service.cc',
         'browser/extensions/extensions_quota_service.h',
         'browser/extensions/extensions_startup.cc',
@@ -430,8 +386,6 @@
         'browser/extensions/settings/setting_change.h',
         'browser/extensions/settings/setting_sync_data.cc',
         'browser/extensions/settings/setting_sync_data.h',
-        'browser/extensions/settings/settings_api.cc',
-        'browser/extensions/settings/settings_api.h',
         'browser/extensions/settings/settings_backend.cc',
         'browser/extensions/settings/settings_backend.h',
         'browser/extensions/settings/settings_frontend.cc',
@@ -456,8 +410,6 @@
         'browser/extensions/settings/testing_settings_storage.h',
         'browser/extensions/settings/weak_unlimited_settings_storage.cc',
         'browser/extensions/settings/weak_unlimited_settings_storage.h',
-        'browser/extensions/system/system_api.cc',
-        'browser/extensions/system/system_api.h',
         'browser/extensions/theme_installed_infobar_delegate.cc',
         'browser/extensions/theme_installed_infobar_delegate.h',
         'browser/extensions/unpacked_installer.cc',
@@ -507,6 +459,89 @@
             'browser/extensions/default_apps.h',
           ],
         }],
+        ['enable_extensions==1', {
+          'sources': [
+            'browser/extensions/execute_code_in_tab_function.cc',
+            'browser/extensions/execute_code_in_tab_function.h',
+            'browser/extensions/extension_chrome_auth_private_api.cc',
+            'browser/extensions/extension_chrome_auth_private_api.h',
+            'browser/extensions/extension_content_settings_api.cc',
+            'browser/extensions/extension_content_settings_api.h',
+            'browser/extensions/extension_context_menu_api.cc',
+            'browser/extensions/extension_context_menu_api.h',
+            'browser/extensions/extension_cookies_api.cc',
+            'browser/extensions/extension_cookies_api.h',
+            'browser/extensions/extension_debugger_api.cc',
+            'browser/extensions/extension_debugger_api.h',
+            'browser/extensions/extension_font_settings_api.cc',
+            'browser/extensions/extension_font_settings_api.h',
+            'browser/extensions/extension_i18n_api.cc',
+            'browser/extensions/extension_i18n_api.h',
+            'browser/extensions/extension_idle_api.cc',
+            'browser/extensions/extension_idle_api.h',
+            'browser/extensions/extension_input_api.cc',
+            'browser/extensions/extension_input_api.h',
+            'browser/extensions/extension_input_ime_api.cc',
+            'browser/extensions/extension_input_ime_api.h',
+            'browser/extensions/extension_input_method_api.cc',
+            'browser/extensions/extension_input_method_api.h',
+            'browser/extensions/extension_input_ui_api.cc',
+            'browser/extensions/extension_input_ui_api.h',
+            'browser/extensions/extension_managed_mode_api.cc',
+            'browser/extensions/extension_managed_mode_api.h',
+            'browser/extensions/extension_management_api.cc',
+            'browser/extensions/extension_management_api.h',
+            'browser/extensions/extension_metrics_module.cc',
+            'browser/extensions/extension_metrics_module.h',
+            'browser/extensions/extension_page_capture_api.cc',
+            'browser/extensions/extension_page_capture_api.h',
+            'browser/extensions/extension_preference_api.cc',
+            'browser/extensions/extension_preference_api.h',
+            'browser/extensions/extension_tabs_module.cc',
+            'browser/extensions/extension_tabs_module.h',
+            'browser/extensions/extension_test_api.cc',
+            'browser/extensions/extension_test_api.h',
+            'browser/extensions/extension_web_socket_proxy_private_api.cc',
+            'browser/extensions/extension_web_socket_proxy_private_api.h',
+            'browser/extensions/extension_webstore_private_api.cc',
+            'browser/extensions/extension_webstore_private_api.h',
+            'browser/extensions/settings/settings_api.cc',
+            'browser/extensions/settings/settings_api.h',
+            'browser/extensions/system/system_api.cc',
+            'browser/extensions/system/system_api.h',
+          ],
+        }, {  # enable_extensions==0
+          'sources/': [
+            # Handle files in browser/extensions/api. Exclude everything by default, white list
+            # files if they are needed for linking.
+            # TODO: The re-includes should go away or shrink as extensions are refactored to be
+            # less intertwined in the main codebase.
+            ['exclude', '^browser/extensions/api/'],
+            ['include', '^browser/extensions/api/declarative/initializing_rules_registry.cc'],
+            ['include', '^browser/extensions/api/declarative/rules_registry.cc'],
+            ['include', '^browser/extensions/api/declarative/rules_registry_service.cc'],
+            ['include', '^browser/extensions/api/declarative/rules_registry_with_cache.cc'],
+            ['include', '^browser/extensions/api/declarative/substring_set_matcher.cc'],
+            ['include', '^browser/extensions/api/declarative/url_matcher.cc'],
+            ['include', '^browser/extensions/api/declarative_webrequest/webrequest_action.cc'],
+            ['include', '^browser/extensions/api/declarative_webrequest/webrequest_condition.cc'],
+            ['include', '^browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc'],
+            ['include', '^browser/extensions/api/declarative_webrequest/webrequest_constants.cc'],
+            ['include', '^browser/extensions/api/declarative_webrequest/webrequest_rule.cc'],
+            ['include', '^browser/extensions/api/declarative_webrequest/webrequest_rules_registry.cc'],
+            ['include', '^browser/extensions/api/permissions/permissions_api.cc'],
+            ['include', '^browser/extensions/api/permissions/permissions_api_helpers.cc'],
+            ['include', '^browser/extensions/api/proxy/proxy_api.cc'],
+            ['include', '^browser/extensions/api/proxy/proxy_api_constants.cc'],
+            ['include', '^browser/extensions/api/runtime/runtime_api.cc'],
+            ['include', '^browser/extensions/api/web_navigation/web_navigation_api.cc'],
+            ['include', '^browser/extensions/api/web_navigation/web_navigation_api_constants.cc'],
+            ['include', '^browser/extensions/api/web_request/web_request_api.cc'],
+            ['include', '^browser/extensions/api/web_request/web_request_api_constants.cc'],
+            ['include', '^browser/extensions/api/web_request/web_request_api_helpers.cc'],
+            ['include', '^browser/extensions/api/web_request/web_request_time_tracker.cc'],
+          ],
+        }],
         ['use_virtual_keyboard==0', {
           'sources/': [
             ['exclude', '^browser/extensions/extension_input_ui_api.*'],