Revert 176015

chrome/chrome_browser_extensions.gypi

 # Copyright (c) 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.
 
 {
   'targets': [
     {
       'target_name': 'browser_extensions',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 79 matching lines @@
         'browser/extensions/api/bluetooth/bluetooth_api_utils.cc',
         'browser/extensions/api/bluetooth/bluetooth_api_utils.h',
         'browser/extensions/api/bluetooth/bluetooth_event_router.cc',
         'browser/extensions/api/bluetooth/bluetooth_event_router.h',
         'browser/extensions/api/bluetooth/bluetooth_extension_function.cc',
         'browser/extensions/api/bluetooth/bluetooth_extension_function.h',
         'browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc',
         'browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h',
         'browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api_constants.cc',
         'browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api_constants.h',
+        'browser/extensions/api/bookmarks/bookmark_api.cc',
+        'browser/extensions/api/bookmarks/bookmark_api.h',
         'browser/extensions/api/bookmarks/bookmark_api_constants.cc',
         'browser/extensions/api/bookmarks/bookmark_api_constants.h',
         'browser/extensions/api/bookmarks/bookmark_api_factory.cc',
         'browser/extensions/api/bookmarks/bookmark_api_factory.h',
         'browser/extensions/api/bookmarks/bookmark_api_helpers.cc',
         'browser/extensions/api/bookmarks/bookmark_api_helpers.h',
-        'browser/extensions/api/bookmarks/bookmarks_api.cc',
-        'browser/extensions/api/bookmarks/bookmarks_api.h',
         'browser/extensions/api/browsing_data/browsing_data_api.cc',
         'browser/extensions/api/browsing_data/browsing_data_api.h',
         'browser/extensions/api/cloud_print_private/cloud_print_private_api.cc',
         'browser/extensions/api/cloud_print_private/cloud_print_private_api.h',
         'browser/extensions/api/commands/command_service.cc',
         'browser/extensions/api/commands/command_service.h',
         'browser/extensions/api/commands/command_service_factory.cc',
         'browser/extensions/api/commands/command_service_factory.h',
         'browser/extensions/api/content_settings/content_settings_api.cc',
         'browser/extensions/api/content_settings/content_settings_api.h',
         'browser/extensions/api/content_settings/content_settings_api_constants.cc',
         'browser/extensions/api/content_settings/content_settings_api_constants.h',
         'browser/extensions/api/content_settings/content_settings_helpers.cc',
         'browser/extensions/api/content_settings/content_settings_helpers.h',
         'browser/extensions/api/content_settings/content_settings_store.cc',
         'browser/extensions/api/content_settings/content_settings_store.h',
         'browser/extensions/api/commands/commands.cc',
         'browser/extensions/api/commands/commands.h',
-        'browser/extensions/api/context_menus/context_menus_api.cc',
-        'browser/extensions/api/context_menus/context_menus_api.h',
+        'browser/extensions/api/context_menu/context_menu_api.cc',
+        'browser/extensions/api/context_menu/context_menu_api.h',
         'browser/extensions/api/cookies/cookies_api.cc',
         'browser/extensions/api/cookies/cookies_api.h',
         'browser/extensions/api/cookies/cookies_api_constants.cc',
         'browser/extensions/api/cookies/cookies_api_constants.h',
         'browser/extensions/api/cookies/cookies_helpers.cc',
         'browser/extensions/api/cookies/cookies_helpers.h',
         'browser/extensions/api/debugger/debugger_api.cc',
         'browser/extensions/api/debugger/debugger_api.h',
         'browser/extensions/api/debugger/debugger_api_constants.cc',
         'browser/extensions/api/debugger/debugger_api_constants.h',
@@ skipping 179 matching lines @@
         'browser/extensions/api/serial/serial_port_enumerator_posix.cc',
         'browser/extensions/api/serial/serial_port_enumerator_win.cc',
         'browser/extensions/api/socket/socket.cc',
         'browser/extensions/api/socket/socket.h',
         'browser/extensions/api/socket/socket_api.cc',
         'browser/extensions/api/socket/socket_api.h',
         'browser/extensions/api/socket/tcp_socket.cc',
         'browser/extensions/api/socket/tcp_socket.h',
         'browser/extensions/api/socket/udp_socket.cc',
         'browser/extensions/api/socket/udp_socket.h',
-        'browser/extensions/api/storage/leveldb_settings_storage_factory.cc',
-        'browser/extensions/api/storage/leveldb_settings_storage_factory.h',
-        'browser/extensions/api/storage/managed_value_store_cache.cc',
-        'browser/extensions/api/storage/managed_value_store_cache.h',
-        'browser/extensions/api/storage/policy_value_store.cc',
-        'browser/extensions/api/storage/policy_value_store.h',
-        'browser/extensions/api/storage/setting_sync_data.cc',
-        'browser/extensions/api/storage/setting_sync_data.h',
-        'browser/extensions/api/storage/settings_backend.cc',
-        'browser/extensions/api/storage/settings_backend.h',
-        'browser/extensions/api/storage/settings_frontend.cc',
-        'browser/extensions/api/storage/settings_frontend.h',
-        'browser/extensions/api/storage/settings_namespace.cc',
-        'browser/extensions/api/storage/settings_namespace.h',
-        'browser/extensions/api/storage/settings_observer.h',
-        'browser/extensions/api/storage/settings_storage_factory.h',
-        'browser/extensions/api/storage/settings_storage_quota_enforcer.cc',
-        'browser/extensions/api/storage/settings_storage_quota_enforcer.h',
-        'browser/extensions/api/storage/settings_sync_processor.cc',
-        'browser/extensions/api/storage/settings_sync_processor.h',
-        'browser/extensions/api/storage/settings_sync_util.cc',
-        'browser/extensions/api/storage/settings_sync_util.h',
-        'browser/extensions/api/storage/storage_api.cc',
-        'browser/extensions/api/storage/storage_api.h',
-        'browser/extensions/api/storage/sync_or_local_value_store_cache.cc',
-        'browser/extensions/api/storage/sync_or_local_value_store_cache.h',
-        'browser/extensions/api/storage/syncable_settings_storage.cc',
-        'browser/extensions/api/storage/syncable_settings_storage.h',
-        'browser/extensions/api/storage/value_store_cache.cc',
-        'browser/extensions/api/storage/value_store_cache.h',
-        'browser/extensions/api/storage/weak_unlimited_settings_storage.cc',
-        'browser/extensions/api/storage/weak_unlimited_settings_storage.h',
         'browser/extensions/api/sync_file_system/extension_sync_event_observer_factory.cc',
         'browser/extensions/api/sync_file_system/extension_sync_event_observer_factory.h',
         'browser/extensions/api/sync_file_system/extension_sync_event_observer.cc',
         'browser/extensions/api/sync_file_system/extension_sync_event_observer.h',
         'browser/extensions/api/sync_file_system/sync_file_system_api.cc',
         'browser/extensions/api/sync_file_system/sync_file_system_api.h',
         'browser/extensions/api/system_indicator/system_indicator_api.h',
         'browser/extensions/api/system_indicator/system_indicator_manager.cc',
         'browser/extensions/api/system_indicator/system_indicator_manager.h',
         'browser/extensions/api/system_indicator/system_indicator_manager_factory.cc',
@@ skipping 23 matching lines @@
         'browser/extensions/api/system_info_storage/storage_info_provider_mac.cc',
         'browser/extensions/api/system_info_storage/storage_info_provider_win.cc',
         'browser/extensions/api/system_info_storage/system_info_storage_api.cc',
         'browser/extensions/api/system_info_storage/system_info_storage_api.h',
         'browser/extensions/api/tab_capture/tab_capture_api.cc',
         'browser/extensions/api/tab_capture/tab_capture_api.h',
         'browser/extensions/api/tab_capture/tab_capture_registry.cc',
         'browser/extensions/api/tab_capture/tab_capture_registry.h',
         'browser/extensions/api/tab_capture/tab_capture_registry_factory.cc',
         'browser/extensions/api/tab_capture/tab_capture_registry_factory.h',
-        'browser/extensions/api/tabs/tabs_api.cc',
-        'browser/extensions/api/tabs/tabs_api.h',
+        'browser/extensions/api/tabs/execute_code_in_tab_function.cc',
+        'browser/extensions/api/tabs/execute_code_in_tab_function.h',
+        'browser/extensions/api/tabs/tabs.cc',
+        'browser/extensions/api/tabs/tabs.h',
         'browser/extensions/api/tabs/tabs_windows_api.cc',
         'browser/extensions/api/tabs/tabs_windows_api.h',
         'browser/extensions/api/tabs/tabs_constants.cc',
         'browser/extensions/api/tabs/tabs_constants.h',
         'browser/extensions/api/tabs/windows_event_router.cc',
         'browser/extensions/api/tabs/windows_event_router.h',
         'browser/extensions/api/terminal/terminal_extension_helper.cc',
         'browser/extensions/api/terminal/terminal_extension_helper.h',
         'browser/extensions/api/terminal/terminal_private_api.cc',
         'browser/extensions/api/terminal/terminal_private_api.h',
@@ skipping 245 matching lines @@
         'browser/extensions/requirements_checker.cc',
         'browser/extensions/requirements_checker.h',
         'browser/extensions/sandboxed_unpacker.cc',
         'browser/extensions/sandboxed_unpacker.h',
         'browser/extensions/script_badge_controller.cc',
         'browser/extensions/script_badge_controller.h',
         'browser/extensions/script_bubble_controller.cc',
         'browser/extensions/script_bubble_controller.h',
         'browser/extensions/script_executor.cc',
         'browser/extensions/script_executor.h',
+        'browser/extensions/settings/leveldb_settings_storage_factory.cc',
+        'browser/extensions/settings/leveldb_settings_storage_factory.h',
+        'browser/extensions/settings/managed_value_store_cache.cc',
+        'browser/extensions/settings/managed_value_store_cache.h',
+        'browser/extensions/settings/policy_value_store.cc',
+        'browser/extensions/settings/policy_value_store.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',
+        'browser/extensions/settings/settings_frontend.h',
+        'browser/extensions/settings/settings_namespace.cc',
+        'browser/extensions/settings/settings_namespace.h',
+        'browser/extensions/settings/settings_observer.h',
+        'browser/extensions/settings/settings_storage_factory.h',
+        'browser/extensions/settings/settings_storage_quota_enforcer.cc',
+        'browser/extensions/settings/settings_storage_quota_enforcer.h',
+        'browser/extensions/settings/settings_sync_processor.cc',
+        'browser/extensions/settings/settings_sync_processor.h',
+        'browser/extensions/settings/settings_sync_util.cc',
+        'browser/extensions/settings/settings_sync_util.h',
+        'browser/extensions/settings/sync_or_local_value_store_cache.cc',
+        'browser/extensions/settings/sync_or_local_value_store_cache.h',
+        'browser/extensions/settings/syncable_settings_storage.cc',
+        'browser/extensions/settings/syncable_settings_storage.h',
+        'browser/extensions/settings/value_store_cache.cc',
+        'browser/extensions/settings/value_store_cache.h',
+        'browser/extensions/settings/weak_unlimited_settings_storage.cc',
+        'browser/extensions/settings/weak_unlimited_settings_storage.h',
         'browser/extensions/shell_window_geometry_cache.cc',
         'browser/extensions/shell_window_geometry_cache.h',
         'browser/extensions/shell_window_registry.cc',
         'browser/extensions/shell_window_registry.h',
         'browser/extensions/standard_management_policy_provider.cc',
         'browser/extensions/standard_management_policy_provider.h',
         'browser/extensions/startup_helper.cc',
         'browser/extensions/startup_helper.h',
         'browser/extensions/state_store.cc',
         'browser/extensions/state_store.h',
@@ skipping 98 matching lines @@
             ['include', '^browser/extensions/api/messaging/native_process_launcher_posix.cc'],
             ['include', '^browser/extensions/api/messaging/native_process_launcher_win.cc'],
             ['include', '^browser/extensions/api/messaging/native_message_port.cc'],
             ['include', '^browser/extensions/api/omnibox/omnibox_api.cc'],
             ['include', '^browser/extensions/api/processes/processes_api.cc'],
             ['include', '^browser/extensions/api/processes/processes_api_constants.cc'],
             ['include', '^browser/extensions/api/proxy/proxy_api.cc'],
             ['include', '^browser/extensions/api/proxy/proxy_api_constants.cc'],
             ['include', '^browser/extensions/api/push_messaging/push_messaging_api.cc'],
             ['include', '^browser/extensions/api/runtime/runtime_api.cc'],
-            ['include', '^browser/extensions/api/storage/.*\.cc'],
             ['include', '^browser/extensions/api/system_info_cpu/cpu_info_provider.cc'],
             ['include', '^browser/extensions/api/system_info_cpu/cpu_info_provider_android.cc'],
             ['include', '^browser/extensions/api/tabs/tabs_constants.cc'],
             ['include', '^browser/extensions/api/web_navigation/frame_navigation_state.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_navigation/web_navigation_api_helpers.cc'],
             ['include', '^browser/extensions/api/web_request/form_data_parser.cc'],
             ['include', '^browser/extensions/api/web_request/upload_data_presenter.cc'],
             ['include', '^browser/extensions/api/web_request/web_request_api.cc'],
@@ skipping 26 matching lines @@
             '../dbus/dbus.gyp:dbus',
             '../third_party/undoview/undoview.gyp:undoview',
           ],
         }],
         ['configuration_policy==1', {
           'dependencies': [
             'app/policy/cloud_policy_codegen.gyp:policy',
           ],
         }, {  # configuration_policy==0
           'sources!': [
-            'browser/extensions/api/storage/managed_value_store_cache.cc',
-            'browser/extensions/api/storage/managed_value_store_cache.h',
-            'browser/extensions/api/storage/policy_value_store.cc',
-            'browser/extensions/api/storage/policy_value_store.h',
+            'browser/extensions/settings/managed_value_store_cache.cc',
+            'browser/extensions/settings/managed_value_store_cache.h',
+            'browser/extensions/settings/policy_value_store.cc',
+            'browser/extensions/settings/policy_value_store.h',
           ],
         }],
         ['OS=="win"', {
           'dependencies': [
             'launcher_support',
             '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
             '../third_party/isimpledom/isimpledom.gyp:isimpledom',
           ],
           'conditions': [
             ['win_use_allocator_shim==1', {
@@ skipping 105 matching lines @@
           'msvs_settings': {
             'VCLinkerTool': {
               'SubSystem': '2',  # Set /SUBSYSTEM:WINDOWS
             },
           },
         },
       ],
     }, ],  # 'OS=="win"'
   ],  # 'conditions'
 }