Move the windows-specific scoped_* stuff from base to base/win and in the bas...

base/base.gyp

 # Copyright (c) 2010 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': {
     'chromium_code': 1,
   },
   'includes': [
     'base.gypi',
@@ skipping 106 matching lines @@
         'pickle_unittest.cc',
         'platform_file_unittest.cc',
         'platform_thread_unittest.cc',
         'pr_time_unittest.cc',
         'process_util_unittest.cc',
         'process_util_unittest_mac.h',
         'process_util_unittest_mac.mm',
         'rand_util_unittest.cc',
         'ref_counted_unittest.cc',
         'registry_unittest.cc',
-        'scoped_bstr_win_unittest.cc',
-        'scoped_comptr_win_unittest.cc',
         'scoped_native_library_unittest.cc',
         'scoped_ptr_unittest.cc',
         'scoped_temp_dir_unittest.cc',
-        'scoped_variant_win_unittest.cc',
         'sha1_unittest.cc',
         'sha2_unittest.cc',
         'shared_memory_unittest.cc',
         'simple_thread_unittest.cc',
         'singleton_unittest.cc',
         'stack_container_unittest.cc',
         'string_number_conversions_unittest.cc',
         'string_piece_unittest.cc',
         'string_split_unittest.cc',
         'string_tokenizer_unittest.cc',
@@ skipping 18 matching lines @@
         'utf_offset_string_conversions_unittest.cc',
         'utf_string_conversions_unittest.cc',
         'values_unittest.cc',
         'version_unittest.cc',
         'vlog_unittest.cc',
         'waitable_event_unittest.cc',
         'waitable_event_watcher_unittest.cc',
         'watchdog_unittest.cc',
         'weak_ptr_unittest.cc',
         'win_util_unittest.cc',
+        'win/scoped_bstr_unittest.cc',
+        'win/scoped_comptr_unittest.cc',
+        'win/scoped_variant_unittest.cc',
         'worker_pool_unittest.cc',
       ],
       'include_dirs': [
         # word_iterator.h (used by word_iterator_unittest.cc) leaks an ICU
         # #include for unicode/uchar.h.  This should probably be cleaned up.
         '../third_party/icu/public/common',
       ],
       'dependencies': [
         'base',
         'base_i18n',
@@ skipping 25 matching lines @@
         # TODO(mark): This should not be necessary.
         ['OS == "win"', {
           'dependencies': [
             '../third_party/icu/icu.gyp:icudata',
           ],
           'sources!': [
             'dir_reader_posix_unittest.cc',
             'file_descriptor_shuffle_unittest.cc',
           ],
         }, {  # OS != "win"
+          'sources/': [
+            ['exclude', '/win/*'],
+          ],
           'sources!': [
             'event_trace_consumer_win_unittest.cc',
             'event_trace_controller_win_unittest.cc',
             'event_trace_provider_win_unittest.cc',
             'object_watcher_unittest.cc',
             'pe_image_unittest.cc',
             'registry_unittest.cc',
             'scoped_bstr_win_unittest.cc',
             'scoped_comptr_win_unittest.cc',
             'scoped_variant_win_unittest.cc',
@@ skipping 88 matching lines @@
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: