Moving extensions inside chrome/browser/extensions/

chrome/chrome_tests.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.
 {
   'variables' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
       'common/pref_names.cc',
@@ skipping 1285 matching lines @@
         'browser/extensions/api/declarative/rules_registry_service_unittest.cc',
         'browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc',
         'browser/extensions/api/declarative/substring_set_matcher_unittest.cc',
         'browser/extensions/api/declarative/url_matcher_unittest.cc',
         'browser/extensions/api/declarative/url_matcher_factory_unittest.cc',
         'browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc',
         'browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc',
         'browser/extensions/api/declarative_webrequest/webrequest_condition_unittest.cc',
         'browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc',
         'browser/extensions/api/extension_action/extension_browser_actions_api_unittest.cc',
+        'browser/extensions/api/omnibox/omnibox_unittest.cc',
         'browser/extensions/api/permissions/permissions_api_helpers_unittest.cc',
         'browser/extensions/api/proxy/proxy_api_helpers_unittest.cc',
         'browser/extensions/api/serial/serial_connection_unittest.cc',
         'browser/extensions/api/socket/tcp_socket_unittest.cc',
         'browser/extensions/api/web_navigation/web_navigation_unittest.cc',
         'browser/extensions/api/web_request/web_request_api_unittest.cc',
         'browser/extensions/api/web_request/web_request_time_tracker_unittest.cc',
         'browser/extensions/app_notification_manager_sync_unittest.cc',
         'browser/extensions/app_notification_manager_unittest.cc',
         'browser/extensions/app_notification_storage_unittest.cc',
         'browser/extensions/app_notification_test_util.cc',
         'browser/extensions/app_notify_channel_setup_unittest.cc',
         'browser/extensions/app_sync_data_unittest.cc',
         'browser/extensions/apps_promo_unittest.cc',
         'browser/extensions/component_loader_unittest.cc',
         'browser/extensions/convert_user_script_unittest.cc',
         'browser/extensions/convert_web_app_unittest.cc',
         'browser/extensions/extension_content_settings_store_unittest.cc',
         'browser/extensions/extension_content_settings_unittest.cc',
         'browser/extensions/extension_cookies_unittest.cc',
         'browser/extensions/extension_creator_filter_unittest.cc',
         'browser/extensions/extension_event_router_forwarder_unittest.cc',
         'browser/extensions/extension_function_test_utils.cc',
         'browser/extensions/extension_function_test_utils.h',
         'browser/extensions/extension_icon_manager_unittest.cc',
         'browser/extensions/extension_idle_api_unittest.cc',
         'browser/extensions/extension_info_map_unittest.cc',
         'browser/extensions/extension_menu_manager_unittest.cc',
-        'browser/extensions/extension_omnibox_unittest.cc',
         'browser/extensions/extension_pref_value_map_unittest.cc',
         'browser/extensions/extension_prefs_unittest.cc',
         'browser/extensions/extension_prefs_unittest.h',
         'browser/extensions/extension_process_manager_unittest.cc',
         'browser/extensions/extension_protocols_unittest.cc',
         'browser/extensions/extension_service_unittest.cc',
         'browser/extensions/extension_service_unittest.h',
         'browser/extensions/extension_sorting_unittest.cc',
         'browser/extensions/extension_special_storage_policy_unittest.cc',
         'browser/extensions/extension_sync_data_unittest.cc',
@@ skipping 772 matching lines @@
         ['target_arch!="arm"', {
           'dependencies': [
             # build time dependency.
             '../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/extensions/extension_omnibox_unittest.cc'],

[Matt Perry, 2012/05/01 01:23:21]

did you mean to add this?

[vabr (Chromium), 2012/05/01 02:06:50]

I actually wanted to remove the whole line, because the unittest is now in
browser/extensions/api, which is already excluded. Done now.

             ['exclude', '^browser/sync/glue/chrome_extensions_activity_monitor_unittest.cc'],
           ],
         }],
         ['use_aura==1', {
           'dependencies': [
             '../ui/aura/aura.gyp:test_support_aura',
           ],
           'sources/': [
             ['exclude', '^browser/automation/automation_provider_unittest.cc'],
             ['exclude', '^browser/accessibility/browser_accessibility_win_unittest.cc'],
@@ skipping 599 matching lines @@
         'browser/extensions/all_urls_apitest.cc',
         'browser/extensions/api/app/app_apitest.cc',
         'browser/extensions/api/browsing_data/browsing_data_test.cc',
         'browser/extensions/api/declarative/declarative_apitest.cc',
         'browser/extensions/api/dns/dns_apitest.cc',
         'browser/extensions/api/extension_action/browser_action_apitest.cc',
         'browser/extensions/api/extension_action/page_action_apitest.cc',
         'browser/extensions/api/extension_action/page_as_browser_action_apitest.cc',
         'browser/extensions/api/identity/identity_apitest.cc',
         'browser/extensions/api/offscreen_tabs/offscreen_tabs_apitest.cc',
+        'browser/extensions/api/omnibox/omnibox_apitest.cc',
         'browser/extensions/api/permissions/permissions_apitest.cc',
         'browser/extensions/api/proxy/proxy_apitest.cc',
         'browser/extensions/api/serial/serial_apitest.cc',
         'browser/extensions/api/socket/socket_apitest.cc',
         'browser/extensions/api/terminal/terminal_private_apitest.cc',
         'browser/extensions/api/web_navigation/web_navigation_apitest.cc',
         'browser/extensions/api/web_request/web_request_apitest.cc',
         'browser/extensions/app_background_page_apitest.cc',
         'browser/extensions/app_notification_browsertest.cc',
         'browser/extensions/app_process_apitest.cc',
@@ skipping 50 matching lines @@
         'browser/extensions/extension_install_ui_browsertest.cc',
         'browser/extensions/extension_javascript_url_apitest.cc',
         'browser/extensions/extension_keybinding_apitest.cc',
         'browser/extensions/extension_managed_mode_apitest.cc',
         'browser/extensions/extension_management_api_browsertest.cc',
         'browser/extensions/extension_management_apitest.cc',
         'browser/extensions/extension_management_browsertest.cc',
         'browser/extensions/extension_messages_apitest.cc',
         'browser/extensions/extension_metrics_apitest.cc',
         'browser/extensions/extension_module_apitest.cc',
-        'browser/extensions/extension_omnibox_apitest.cc',
         'browser/extensions/extension_override_apitest.cc',
         'browser/extensions/extension_page_capture_apitest.cc',
         'browser/extensions/extension_preference_apitest.cc',
         'browser/extensions/extension_processes_apitest.cc',
         'browser/extensions/extension_resource_request_policy_apitest.cc',
         'browser/extensions/extension_startup_browsertest.cc',
         'browser/extensions/extension_storage_apitest.cc',
         'browser/extensions/extension_tabs_apitest.cc',
         'browser/extensions/extension_tabs_test.cc',
         'browser/extensions/extension_test_message_listener.cc',
@@ skipping 1818 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }