Move NaCl loader related files to components/nacl/loader.

chrome/chrome_tests_unit.gypi

 # Copyright 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': [
     {
       # This target contains mocks and test utilities that don't belong in
       # production libraries but are used by more than one test executable.
       'target_name': 'test_support_common',
       'type': 'static_library',
@@ skipping 1708 matching lines @@
         'common/policy/policy_schema_unittest.cc',
         'common/pref_names_util_unittest.cc',
         'common/service_process_util_unittest.cc',
         'common/switch_utils_unittest.cc',
         'common/thumbnail_score_unittest.cc',
         'common/time_format_unittest.cc',
         'common/translate/language_detection_util_unittest.cc',
         'common/translate/translate_common_metrics_unittest.cc',
         'common/translate/translate_util_unittest.cc',
         'common/worker_thread_ticker_unittest.cc',
-        'nacl/nacl_ipc_adapter_unittest.cc',
-        'nacl/nacl_validation_query_unittest.cc',
         'renderer/chrome_content_renderer_client_unittest.cc',
         'renderer/content_settings_observer_unittest.cc',
         'renderer/extensions/chrome_v8_context_set_unittest.cc',
         'renderer/extensions/event_unittest.cc',
         'renderer/extensions/extension_localization_peer_unittest.cc',
         'renderer/extensions/json_schema_unittest.cc',
         'renderer/extensions/module_system_unittest.cc',
         'renderer/extensions/renderer_permissions_policy_delegate_unittest.cc',
         'renderer/extensions/safe_builtins_unittest.cc',
         'renderer/media/chrome_webrtc_log_message_delegate_unittest.cc',
@@ skipping 90 matching lines @@
         '../components/autofill/core/browser/phone_number_unittest.cc',
         '../components/autofill/core/browser/phone_number_i18n_unittest.cc',
         '../components/autofill/core/browser/validation_unittest.cc',
 
         # TODO(caitkp): Move to //components/components_tests.gypi once
         # remaining dependencies back to //chrome are eliminated.
         '../components/autofill/core/browser/webdata/autofill_entry_unittest.cc',
         '../components/autofill/core/browser/webdata/autofill_table_unittest.cc',
         '../components/autofill/core/browser/webdata/web_data_service_unittest.cc',
         '../components/autofill/core/common/password_form_fill_data_unittest.cc',
+
+        '../components/nacl/loader/nacl_ipc_adapter_unittest.cc',

[Mark Seaborn, 2013/07/26 17:04:40]

Please add a TODO comment here as described in my previous message.

+        '../components/nacl/loader/nacl_validation_query_unittest.cc',
+
         '../components/webdata/common/web_database_migration_unittest.cc',
         '../components/webdata/common/web_data_service_test_util.cc',
         '../components/webdata/common/web_data_service_test_util.h',
         '../components/webdata/encryptor/ie7_password_unittest_win.cc',
 
         # TODO(joi): Move the google_apis tests to a separate
         # google_apis_unittests executable.
         '../google_apis/google_api_keys_unittest.cc',
         '../google_apis/cup/client_update_protocol_unittest.cc',
         '../google_apis/gaia/mock_url_fetcher_factory.h',
@@ skipping 115 matching lines @@
             'browser/ui/cocoa/one_click_signin_bubble_controller_unittest.mm',
             'browser/ui/sync/one_click_signin_helper_unittest.cc',
           ]
         }],
         ['disable_nacl==1', {
           'sources!':[
             'browser/nacl_host/nacl_file_host_unittest.cc',
             'browser/nacl_host/nacl_validation_cache_unittest.cc',
             'browser/nacl_host/pnacl_host_unittest.cc',
             'browser/nacl_host/pnacl_translation_cache_unittest.cc',
-            'nacl/nacl_ipc_adapter_unittest.cc',
-            'nacl/nacl_validation_query_unittest.cc',
+            '../components/nacl/loader/nacl_ipc_adapter_unittest.cc',

[Mark Seaborn, 2013/07/26 17:04:40]

And add a similar TODO comment here too so that this doesn't get missed.

+            '../components/nacl/loader/nacl_validation_query_unittest.cc',
           ],
         }],
         ['enable_extensions==0', {
           'sources/': [
             ['exclude', '^../extensions/'],
             ['exclude', '^browser/extensions/activity_log/'],
             ['exclude', '^browser/extensions/api/'],
             ['exclude', '^browser/sync/glue/chrome_extensions_activity_monitor_unittest.cc'],
             ['exclude', '^common/extensions/api/'],
             ['exclude', '^common/extensions/manifest_handlers/'],
@@ skipping 663 matching lines @@
               # more details.
               'DebugInformationFormat': '3',
               'ProgramDataBaseFileName': '<(PRODUCT_DIR)/unit_tests.exe.pdb',
             },
           },
         },
       ],
     }],
   ],  # 'conditions'
 }