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

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

16 files changed, 166 insertions, 200 deletions

diff --git a/build/common.gypi b/build/common.gypi
index 7001af3..5a09bc9 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -223,9 +223,6 @@
       # and extensions Web Intents support.
       'enable_web_intents%': 1,
 
-      # Enable Chrome browser extensions
-      'enable_extensions%': 1,
-
       # Enable Web Intents web content registration via HTML element
       # and WebUI managing such registrations.
       'enable_web_intents_tag%': 0,
@@ -518,7 +515,6 @@
     'asan%': '<(asan)',
     'order_text_section%': '<(order_text_section)',
     'enable_register_protocol_handler%': '<(enable_register_protocol_handler)',
-    'enable_extensions%': '<(enable_extensions)',
     'enable_web_intents%': '<(enable_web_intents)',
     'enable_web_intents_tag%': '<(enable_web_intents_tag)',
     'enable_plugin_installation%': '<(enable_plugin_installation)',
@@ -817,7 +813,6 @@
         'configuration_policy%': 0,
         'input_speech%': 0,
         'enable_web_intents%': 0,
-        'enable_extensions%': 0,
         'java_bridge%': 1,
         # Android does not support themes.
         'enable_themes%': 0,
@@ -1018,9 +1013,6 @@
       ['OS=="android"', {
         'grit_defines': ['-D', 'android'],
       }],
-      ['enable_extensions==1', {
-        'grit_defines': ['-D', 'enable_extensions'],
-      }],
       ['clang_use_chrome_plugins==1', {
         'clang_chrome_plugins_flags':
             '<!(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)',
@@ -1410,11 +1402,6 @@
           'ENABLE_WEB_INTENTS=1',
         ],
       }],
-      ['enable_extensions==1', {
-        'defines': [
-          'ENABLE_EXTENSIONS=1',
-        ],
-      }],
       ['OS=="win" and branding=="Chrome"', {
         'defines': ['ENABLE_SWIFTSHADER'],
       }],
diff --git a/chrome/browser/extensions/app_notify_channel_ui.cc b/chrome/browser/extensions/app_notify_channel_ui.cc
index 4217322..ba8ffbb 100644
--- a/chrome/browser/extensions/app_notify_channel_ui.cc
+++ b/chrome/browser/extensions/app_notify_channel_ui.cc
@@ -135,7 +135,6 @@ void AppNotifyChannelUIImpl::OnInfoBarResult(bool accepted) {
 }
 
 void AppNotifyChannelUIImpl::OnStateChanged() {
-#if !defined(OS_ANDROID)
   ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile_);
   LoginUIService* login_service =
@@ -154,7 +153,6 @@ void AppNotifyChannelUIImpl::OnStateChanged() {
     StopObservingSync();
     delegate_->OnSyncSetupResult(sync_service->HasSyncSetupCompleted());
   }
-#endif  // !defined(OS_ANDROID)
 }
 
 void AppNotifyChannelUIImpl::StartObservingSync() {
diff --git a/chrome/browser/extensions/extension_disabled_ui.cc b/chrome/browser/extensions/extension_disabled_ui.cc
index 8eb171a..1d7d59f 100644
--- a/chrome/browser/extensions/extension_disabled_ui.cc
+++ b/chrome/browser/extensions/extension_disabled_ui.cc
@@ -249,7 +249,6 @@ void ExtensionDisabledGlobalError::BubbleViewAcceptButtonPressed(
 
 void ExtensionDisabledGlobalError::BubbleViewCancelButtonPressed(
     Browser* browser) {
-#if !defined(OS_ANDROID)
   uninstall_dialog_.reset(
       ExtensionUninstallDialog::Create(service_->profile(), this));
   // Delay showing the uninstall dialog, so that this function returns
@@ -257,7 +256,6 @@ void ExtensionDisabledGlobalError::BubbleViewCancelButtonPressed(
   MessageLoop::current()->PostTask(FROM_HERE,
       base::Bind(&ExtensionUninstallDialog::ConfirmUninstall,
                  uninstall_dialog_->AsWeakPtr(), extension_));
-#endif  // !defined(OS_ANDROID)
 }
 
 void ExtensionDisabledGlobalError::ExtensionUninstallAccepted() {
diff --git a/chrome/browser/extensions/extension_function_registry.cc b/chrome/browser/extensions/extension_function_registry.cc
index 9e60166..19b5e44 100644
--- a/chrome/browser/extensions/extension_function_registry.cc
+++ b/chrome/browser/extensions/extension_function_registry.cc
@@ -84,8 +84,6 @@ ExtensionFunctionRegistry::~ExtensionFunctionRegistry() {
 }
 
 void ExtensionFunctionRegistry::ResetFunctions() {
-#if defined(ENABLE_EXTENSIONS)
-
   // Register all functions here.
 
   // Windows
@@ -505,7 +503,6 @@ void ExtensionFunctionRegistry::ResetFunctions() {
 
   // Generated APIs
   extensions::api::GeneratedFunctionRegistry::RegisterAll(this);
-#endif  // defined(ENABLE_EXTENSIONS)
 }
 
 void ExtensionFunctionRegistry::GetAllNames(std::vector<std::string>* names) {
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index be176fd..cfb94bd 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -535,7 +535,6 @@ void ExtensionService::InitEventRouters() {
   if (event_routers_initialized_)
     return;
 
-#if defined(ENABLE_EXTENSIONS)
   downloads_event_router_.reset(new ExtensionDownloadsEventRouter(profile_));
   history_event_router_.reset(new HistoryExtensionEventRouter());
   history_event_router_->ObserveProfile(profile_);
@@ -575,7 +574,6 @@ void ExtensionService::InitEventRouters() {
   ExtensionInputUiEventRouter::GetInstance()->Init();
 #endif
 
-#endif  // defined(ENABLE_EXTENSIONS)
   event_routers_initialized_ = true;
 }
 
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
index 3a107dd..6a5e382 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
@@ -810,15 +810,11 @@ void ExtensionSettingsHandler::GetInspectablePagesForExtensionProcess(
 
 ExtensionUninstallDialog*
 ExtensionSettingsHandler::GetExtensionUninstallDialog() {
-#if !defined(OS_ANDROID)
   if (!extension_uninstall_dialog_.get()) {
     extension_uninstall_dialog_.reset(
         ExtensionUninstallDialog::Create(Profile::FromWebUI(web_ui()), this));
   }
   return extension_uninstall_dialog_.get();
-#else
-  return NULL;
-#endif  // !defined(OS_ANDROID)
 }
 
 void ExtensionSettingsHandler::InspectExtensionHost(ExtensionHost* host) {
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 6fd8444..125b2e9 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -85,6 +85,8 @@
         # * code below browser/extensions
         'browser/about_flags.cc',
         'browser/about_flags.h',
+        'browser/accessibility/accessibility_extension_api.cc',
+        'browser/accessibility/accessibility_extension_api.h',
         'browser/accessibility/accessibility_extension_api_constants.cc',
         'browser/accessibility/accessibility_extension_api_constants.h',
         'browser/accessibility/accessibility_events.cc',
@@ -306,6 +308,8 @@
         'browser/bookmarks/bookmark_storage.h',
         'browser/bookmarks/bookmark_utils.cc',
         'browser/bookmarks/bookmark_utils.h',
+        'browser/bookmarks/bookmark_extension_api.cc',
+        'browser/bookmarks/bookmark_extension_api.h',
         'browser/bookmarks/bookmark_extension_api_constants.cc',
         'browser/bookmarks/bookmark_extension_api_constants.h',
         'browser/bookmarks/bookmark_extension_helpers.cc',
@@ -487,6 +491,8 @@
         'browser/chromeos/extensions/file_browser_event_router.h',
         'browser/chromeos/extensions/file_browser_notifications.cc',
         'browser/chromeos/extensions/file_browser_notifications.h',
+        'browser/chromeos/extensions/file_browser_private_api.cc',
+        'browser/chromeos/extensions/file_browser_private_api.h',
         'browser/chromeos/extensions/file_handler_util.cc',
         'browser/chromeos/extensions/file_handler_util.h',
         'browser/chromeos/extensions/file_manager_util.cc',
@@ -495,6 +501,8 @@
         'browser/chromeos/extensions/input_method_event_router.h',
         'browser/chromeos/extensions/media_player_event_router.cc',
         'browser/chromeos/extensions/media_player_event_router.h',
+        'browser/chromeos/extensions/offers_private_api.cc',
+        'browser/chromeos/extensions/offers_private_api.h',
         'browser/chromeos/external_metrics.cc',
         'browser/chromeos/external_metrics.h',
         'browser/chromeos/external_protocol_dialog.cc',
@@ -720,6 +728,8 @@
         'browser/chromeos/login/wizard_screen.h',
         'browser/chromeos/media/media_player.cc',
         'browser/chromeos/media/media_player.h',
+        'browser/chromeos/media/media_player_extension_api.cc',
+        'browser/chromeos/media/media_player_extension_api.h',
         'browser/chromeos/mobile_config.cc',
         'browser/chromeos/mobile_config.h',
         'browser/chromeos/net/cros_network_change_notifier_factory.cc',
@@ -922,6 +932,8 @@
         'browser/download/chrome_download_manager_delegate.h',
         'browser/download/download_crx_util.cc',
         'browser/download/download_crx_util.h',
+        'browser/download/download_extension_api.cc',
+        'browser/download/download_extension_api.h',
         'browser/download/download_extensions.cc',
         'browser/download/download_extensions.h',
         'browser/download/download_file_picker.cc',
@@ -1070,6 +1082,8 @@
         'browser/history/history_backend.h',
         'browser/history/history_database.cc',
         'browser/history/history_database.h',
+        'browser/history/history_extension_api.cc',
+        'browser/history/history_extension_api.h',
         'browser/history/history_marshaling.h',
         'browser/history/history_notifications.cc',
         'browser/history/history_notifications.h',
@@ -1115,6 +1129,8 @@
         'browser/history/top_sites_cache.h',
         'browser/history/top_sites_database.cc',
         'browser/history/top_sites_database.h',
+        'browser/history/top_sites_extension_api.cc',
+        'browser/history/top_sites_extension_api.h',
         'browser/history/url_database.cc',
         'browser/history/url_database.h',
         'browser/history/url_index_private_data.cc',
@@ -1220,6 +1236,8 @@
         'browser/infobars/infobar_container.h',
         'browser/infobars/infobar_delegate.cc',
         'browser/infobars/infobar_delegate.h',
+        'browser/infobars/infobar_extension_api.cc',
+        'browser/infobars/infobar_extension_api.h',
         'browser/infobars/infobar_tab_helper.cc',
         'browser/infobars/infobar_tab_helper.h',
         'browser/instant/instant_commit_type.h',
@@ -1811,6 +1829,8 @@
         'browser/resources_util.h',
         'browser/rlz/rlz.cc',
         'browser/rlz/rlz.h',
+        'browser/rlz/rlz_extension_api.cc',
+        'browser/rlz/rlz_extension_api.h',
         'browser/safe_browsing/bloom_filter.cc',
         'browser/safe_browsing/bloom_filter.h',
         'browser/safe_browsing/browser_feature_extractor.cc',
@@ -1934,6 +1954,8 @@
         'browser/speech/chrome_speech_recognition_manager_delegate.h',
         'browser/speech/chrome_speech_recognition_preferences.cc',
         'browser/speech/chrome_speech_recognition_preferences.h',
+        'browser/speech/extension_api/tts_extension_api.cc',
+        'browser/speech/extension_api/tts_extension_api.h',
         'browser/speech/extension_api/tts_extension_api_chromeos.cc',
         'browser/speech/extension_api/tts_extension_api_constants.cc',
         'browser/speech/extension_api/tts_extension_api_constants.h',
@@ -1944,6 +1966,10 @@
         'browser/speech/extension_api/tts_extension_api_platform.cc',
         'browser/speech/extension_api/tts_extension_api_platform.h',
         'browser/speech/extension_api/tts_extension_api_win.cc',
+        'browser/speech/extension_api/tts_engine_extension_api.cc',
+        'browser/speech/extension_api/tts_engine_extension_api.h',
+        'browser/speech/speech_input_extension_api.cc',
+        'browser/speech/speech_input_extension_api.h',
         'browser/speech/speech_input_extension_manager.cc',
         'browser/speech/speech_input_extension_manager.h',
         'browser/speech/speech_input_extension_notification.cc',
@@ -3959,37 +3985,6 @@
         '<(SHARED_INTERMEDIATE_DIR)/autofill_regex_constants.cc',
       ],
       'conditions': [
-        ['enable_extensions==1', {
-          'sources': [
-            # Only extension API implementations should go here.
-            'browser/accessibility/accessibility_extension_api.cc',
-            'browser/accessibility/accessibility_extension_api.h',
-            'browser/bookmarks/bookmark_extension_api.cc',
-            'browser/bookmarks/bookmark_extension_api.h',
-            'browser/chromeos/extensions/file_browser_private_api.cc',
-            'browser/chromeos/extensions/file_browser_private_api.h',
-            'browser/chromeos/extensions/offers_private_api.cc',
-            'browser/chromeos/extensions/offers_private_api.h',
-            'browser/chromeos/media/media_player_extension_api.cc',
-            'browser/chromeos/media/media_player_extension_api.h',
-            'browser/download/download_extension_api.cc',
-            'browser/download/download_extension_api.h',
-            'browser/history/history_extension_api.cc',
-            'browser/history/history_extension_api.h',
-            'browser/history/top_sites_extension_api.cc',
-            'browser/history/top_sites_extension_api.h',
-            'browser/infobars/infobar_extension_api.cc',
-            'browser/infobars/infobar_extension_api.h',
-            'browser/rlz/rlz_extension_api.cc',
-            'browser/rlz/rlz_extension_api.h',
-            'browser/speech/extension_api/tts_extension_api.cc',
-            'browser/speech/extension_api/tts_extension_api.h',
-            'browser/speech/extension_api/tts_engine_extension_api.cc',
-            'browser/speech/extension_api/tts_engine_extension_api.h',
-            'browser/speech/speech_input_extension_api.cc',
-            'browser/speech/speech_input_extension_api.h',
-          ],
-        }],
         ['enable_background==0', {
           'sources/': [
             ['exclude', '^browser/background/'],
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index e22fe32..3726d46 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -197,18 +197,28 @@
         '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',
@@ -219,6 +229,8 @@
         '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',
@@ -237,6 +249,8 @@
         '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',
@@ -251,8 +265,12 @@
         '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',
@@ -261,14 +279,26 @@
         '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',
@@ -277,18 +307,24 @@
         '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',
@@ -327,8 +363,12 @@
         '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',
@@ -339,10 +379,14 @@
         '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',
@@ -386,6 +430,8 @@
         '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',
@@ -410,6 +456,8 @@
         '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',
@@ -459,89 +507,6 @@
             '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.*'],
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 2744184..649baee 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -97,7 +97,6 @@
                 # resulting .res files get referenced multiple times.
                 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
-                '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
diff --git a/chrome/chrome_repack_chrome.gypi b/chrome/chrome_repack_chrome.gypi
index 2911000..a1e8305 100644
--- a/chrome/chrome_repack_chrome.gypi
+++ b/chrome/chrome_repack_chrome.gypi
@@ -23,11 +23,6 @@
           '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.pak',
         ]
       }],
-      ['enable_extensions==1', {
-        'pak_inputs': [
-          '<(grit_out_dir)/extensions_api_resources.pak',
-        ],
-      }],
     ],
   },
   'inputs': [
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index 9834578..3195eb8 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -100,13 +100,6 @@
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
-        {
-          'action_name': 'extensions_api_resources',
-          'variables': {
-            'grit_grd_file': 'common/extensions_api_resources.grd',
-          },
-          'includes': [ '../build/grit_action.gypi' ],
-        }
       ],
       'includes': [ '../build/grit_target.gypi' ],
     },
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 85ebd2d..9f7516e 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -688,7 +688,6 @@
             # resulting .res files get referenced multiple times.
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
@@ -2157,14 +2156,6 @@
             '../v8/tools/gyp/v8.gyp:v8_shell#host',
           ],
         }],
-        ['enable_extensions==0', {
-          'sources/': [
-            ['exclude', '^browser/extensions/api/'],
-            ['exclude', '^browser/extensions/extension_idle_api_unittest.cc'],
-            ['exclude', '^browser/extensions/extension_omnibox_unittest.cc'],
-            ['exclude', '^browser/sync/glue/chrome_extensions_activity_monitor_unittest.cc'],
-          ],
-        }],
         ['use_aura==1', {
           'dependencies': [
             '../ui/aura/aura.gyp:test_support_aura',
@@ -2411,7 +2402,6 @@
             # resulting .res files get referenced multiple times.
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
@@ -3239,7 +3229,6 @@
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
@@ -3489,7 +3478,6 @@
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
@@ -3625,7 +3613,6 @@
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
@@ -3974,7 +3961,6 @@
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
@@ -4099,7 +4085,6 @@
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
diff --git a/chrome/common/common_resources.grd b/chrome/common/common_resources.grd
index 52463b1..92de543 100644
--- a/chrome/common/common_resources.grd
+++ b/chrome/common/common_resources.grd
@@ -11,6 +11,72 @@
     <includes>
       <include name="IDR_EXTENSION_MANIFEST_FEATURES" file="extensions\api\_manifest_features.json" type="BINDATA" />
       <include name="IDR_EXTENSION_PERMISSION_FEATURES" file="extensions\api\_permission_features.json" type="BINDATA" />
+
+      <include name="IDR_EXTENSION_API_JSON_APP" file="extensions\api\app.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_BOOKMARKS" file="extensions\api\bookmarks.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_BROWSERACTION" file="extensions\api\browserAction.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_BROWSINGDATA" file="extensions\api\browsingData.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_CHROMEAUTHPRIVATE" file="extensions\api\chromeAuthPrivate.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_CHROMEOSINFOPRIVATE" file="extensions\api\chromeosInfoPrivate.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_CONTENTSETTINGS" file="extensions\api\contentSettings.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_CONTEXTMENUS" file="extensions\api\contextMenus.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_COOKIES" file="extensions\api\cookies.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_DEBUGGER" file="extensions\api\debugger.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_DEVTOOLS" file="extensions\api\devtools.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_ACCESSIBILITY" file="extensions\api\experimental.accessibility.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_APP" file="extensions\api\experimental.app.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_ALARMS" file="extensions\api\experimental.alarms.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_BOOKMARKMANAGER" file="extensions\api\experimental.bookmarkManager.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_DECLARATIVE" file="extensions\api\experimental.declarative.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_DOWNLOADS" file="extensions\api\experimental.downloads.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_FONTSSETTINGS" file="extensions\api\experimental.fontSettings.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_IDENTITY" file="extensions\api\experimental.identity.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_INFOBARS" file="extensions\api\experimental.infobars.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_INPUT_UI" file="extensions\api\experimental.input.ui.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_INPUT_VIRTUALKEYBOARD" file="extensions\api\experimental.input.virtualKeyboard.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_KEYBINDING" file="extensions\api\experimental.keybinding.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_MANAGEDMODE" file="extensions\api\experimental.managedMode.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_OFFSCREENTABS" file="extensions\api\experimental.offscreenTabs.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_PROCESSES" file="extensions\api\experimental.processes.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_RLZ" file="extensions\api\experimental.rlz.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_RUNTIME" file="extensions\api\experimental.runtime.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_SPEECHINPUT" file="extensions\api\experimental.speechInput.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_WEBREQUEST" file="extensions\api\experimental.webRequest.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXTENSION" file="extensions\api\extension.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_FILEBROWSERHANDLER" file="extensions\api\fileBrowserHandler.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_FILEBROWSERPRIVATE" file="extensions\api\fileBrowserPrivate.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_HISTORY" file="extensions\api\history.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_I18N" file="extensions\api\i18n.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_INPUT_IME" file="extensions\api\input.ime.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_IDLE" file="extensions\api\idle.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_INPUTMETHODPRIVATE" file="extensions\api\inputMethodPrivate.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_MANAGEMENT" file="extensions\api\management.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_MEDIAPLAYERPRIVATE" file="extensions\api\mediaPlayerPrivate.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_METRICSPRIVATE" file="extensions\api\metricsPrivate.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_OFFERSPRIVATE" file="extensions\api\offersPrivate.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_OMNIBOX" file="extensions\api\omnibox.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_PAGEACTION" file="extensions\api\pageAction.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_PAGEACTIONS" file="extensions\api\pageActions.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_PAGECAPTURE" file="extensions\api\pageCapture.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_PERMISSIONS" file="extensions\api\permissions.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_PRIVACY" file="extensions\api\privacy.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_PROXY" file="extensions\api\proxy.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_STORAGE" file="extensions\api\storage.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_SYSTEMPRIVATE" file="extensions\api\systemPrivate.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_TABS" file="extensions\api\tabs.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_TERMINALPRIVATE" file="extensions\api\terminalPrivate.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_TEST" file="extensions\api\test.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_TOPSITES" file="extensions\api\topSites.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_TTS" file="extensions\api\tts.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_TTSENGINE" file="extensions\api\ttsEngine.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_TYPES" file="extensions\api\types.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_WEBNAVIGATION" file="extensions\api\webNavigation.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_WEBREQUEST" file="extensions\api\webRequest.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_WEBSOCKETPROXYPRIVATE" file="extensions\api\webSocketProxyPrivate.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_WEBSTORE" file="extensions\api\webstore.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_WEBSTOREPRIVATE" file="extensions\api\webstorePrivate.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_WINDOWS" file="extensions\api\windows.json" type="BINDATA" />
+
       <include name="IDR_I18N_PROCESS_JS" file="..\browser\resources\shared\js\i18n_process.js" type="BINDATA" />
       <include name="IDR_I18N_TEMPLATE_JS" file="..\browser\resources\shared\js\i18n_template.js" type="BINDATA" />
       <include name="IDR_JSTEMPLATE_JS" file="..\browser\resources\shared\js\jstemplate_compiled.js" flattenhtml="true" type="BINDATA" />
diff --git a/chrome/common/extensions/api/extension_api.cc b/chrome/common/extensions/api/extension_api.cc
index bdccc9b..bdc2d6d 100644
--- a/chrome/common/extensions/api/extension_api.cc
+++ b/chrome/common/extensions/api/extension_api.cc
@@ -22,7 +22,6 @@
 #include "chrome/common/extensions/simple_feature_provider.h"
 #include "googleurl/src/gurl.h"
 #include "grit/common_resources.h"
-#include "grit/extensions_api_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using base::DictionaryValue;
diff --git a/chrome/renderer/renderer_resources.grd b/chrome/renderer/renderer_resources.grd
index 60eb28f5..07d23e6 100644
--- a/chrome/renderer/renderer_resources.grd
+++ b/chrome/renderer/renderer_resources.grd
@@ -31,34 +31,32 @@ without changes to the corresponding grd file. fb9 -->
       <include name="IDR_SET_ICON_JS" file="resources\extensions\set_icon.js" type="BINDATA" />
 
       <!-- Custom bindings for extension APIs. -->
-      <if expr="pp_ifdef('enable_extensions')">
-        <include name="IDR_APP_CUSTOM_BINDINGS_JS" file="resources\extensions\app_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_BROWSER_ACTION_CUSTOM_BINDINGS_JS" file="resources\extensions\browser_action_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_CONTENT_SETTINGS_CUSTOM_BINDINGS_JS" file="resources\extensions\content_settings_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_CONTEXT_MENUS_CUSTOM_BINDINGS_JS" file="resources\extensions\context_menus_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_DEVTOOLS_CUSTOM_BINDINGS_JS" file="resources\extensions\devtools_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_EXPERIMENTAL_DECLARATIVE_CUSTOM_BINDINGS_JS" file="resources\extensions\experimental.declarative_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_EXPERIMENTAL_OFFSCREENTABS_CUSTOM_BINDINGS_JS" file="resources\extensions\experimental.offscreenTabs_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_EXPERIMENTAL_RUNTIME_CUSTOM_BINDINGS_JS" file="resources\extensions\experimental.runtime_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_EXPERIMENTAL_SOCKET_CUSTOM_BINDINGS_JS" file="resources\extensions\experimental.socket_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_EXPERIMENTAL_WEBREQUEST_CUSTOM_BINDINGS_JS" file="resources\extensions\experimental.webrequest_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_EXTENSION_CUSTOM_BINDINGS_JS" file="resources\extensions\extension_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_FILE_BROWSER_HANDLER_CUSTOM_BINDINGS_JS" file="resources\extensions\file_browser_handler_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_FILE_BROWSER_PRIVATE_CUSTOM_BINDINGS_JS" file="resources\extensions\file_browser_private_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_I18N_CUSTOM_BINDINGS_JS" file="resources\extensions\i18n_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_INPUT_IME_CUSTOM_BINDINGS_JS" file="resources\extensions\input.ime_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_OMNIBOX_CUSTOM_BINDINGS_JS" file="resources\extensions\omnibox_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_PAGE_ACTIONS_CUSTOM_BINDINGS_JS" file="resources\extensions\page_actions_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_PAGE_ACTION_CUSTOM_BINDINGS_JS" file="resources\extensions\page_action_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_PAGE_CAPTURE_CUSTOM_BINDINGS_JS" file="resources\extensions\page_capture_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_STORAGE_CUSTOM_BINDINGS_JS" file="resources\extensions\storage_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_TABS_CUSTOM_BINDINGS_JS" file="resources\extensions\tabs_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_TTS_CUSTOM_BINDINGS_JS" file="resources\extensions\tts_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_TTS_ENGINE_CUSTOM_BINDINGS_JS" file="resources\extensions\tts_engine_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_TYPES_CUSTOM_BINDINGS_JS" file="resources\extensions\types_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_WEB_REQUEST_CUSTOM_BINDINGS_JS" file="resources\extensions\web_request_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_WEBSTORE_CUSTOM_BINDINGS_JS" file="resources\extensions\webstore_custom_bindings.js" type="BINDATA" />
-      </if>
+      <include name="IDR_APP_CUSTOM_BINDINGS_JS" file="resources\extensions\app_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_BROWSER_ACTION_CUSTOM_BINDINGS_JS" file="resources\extensions\browser_action_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_CONTENT_SETTINGS_CUSTOM_BINDINGS_JS" file="resources\extensions\content_settings_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_CONTEXT_MENUS_CUSTOM_BINDINGS_JS" file="resources\extensions\context_menus_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_DEVTOOLS_CUSTOM_BINDINGS_JS" file="resources\extensions\devtools_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_EXPERIMENTAL_DECLARATIVE_CUSTOM_BINDINGS_JS" file="resources\extensions\experimental.declarative_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_EXPERIMENTAL_OFFSCREENTABS_CUSTOM_BINDINGS_JS" file="resources\extensions\experimental.offscreenTabs_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_EXPERIMENTAL_RUNTIME_CUSTOM_BINDINGS_JS" file="resources\extensions\experimental.runtime_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_EXPERIMENTAL_SOCKET_CUSTOM_BINDINGS_JS" file="resources\extensions\experimental.socket_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_EXPERIMENTAL_WEBREQUEST_CUSTOM_BINDINGS_JS" file="resources\extensions\experimental.webrequest_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_EXTENSION_CUSTOM_BINDINGS_JS" file="resources\extensions\extension_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_FILE_BROWSER_HANDLER_CUSTOM_BINDINGS_JS" file="resources\extensions\file_browser_handler_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_FILE_BROWSER_PRIVATE_CUSTOM_BINDINGS_JS" file="resources\extensions\file_browser_private_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_I18N_CUSTOM_BINDINGS_JS" file="resources\extensions\i18n_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_INPUT_IME_CUSTOM_BINDINGS_JS" file="resources\extensions\input.ime_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_OMNIBOX_CUSTOM_BINDINGS_JS" file="resources\extensions\omnibox_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_PAGE_ACTIONS_CUSTOM_BINDINGS_JS" file="resources\extensions\page_actions_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_PAGE_ACTION_CUSTOM_BINDINGS_JS" file="resources\extensions\page_action_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_PAGE_CAPTURE_CUSTOM_BINDINGS_JS" file="resources\extensions\page_capture_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_STORAGE_CUSTOM_BINDINGS_JS" file="resources\extensions\storage_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_TABS_CUSTOM_BINDINGS_JS" file="resources\extensions\tabs_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_TTS_CUSTOM_BINDINGS_JS" file="resources\extensions\tts_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_TTS_ENGINE_CUSTOM_BINDINGS_JS" file="resources\extensions\tts_engine_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_TYPES_CUSTOM_BINDINGS_JS" file="resources\extensions\types_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_WEB_REQUEST_CUSTOM_BINDINGS_JS" file="resources\extensions\web_request_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_WEBSTORE_CUSTOM_BINDINGS_JS" file="resources\extensions\webstore_custom_bindings.js" type="BINDATA" />
     </includes>
   </release>
 </grit>
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
index adc80d4..dc712b2 100644
--- a/tools/gritsettings/resource_ids
+++ b/tools/gritsettings/resource_ids
@@ -178,7 +178,4 @@
   "ash/ash_strings.grd": {
     "messages": [25500],
   },
-  "chrome/common/extensions_api_resources.grd": {
-    "includes": [26000],
-  },
 }