Move debug-related stuff from base to the base/debug directory and use the...

base/base.gypi

 # 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.
 
 {
   'target_defaults': {
     'variables': {
       'base_target': 0,
       'base_extra_target': 0,
     },
@@ skipping 40 matching lines @@
           'condition_variable.h',
           'condition_variable_posix.cc',
           'condition_variable_win.cc',
           'cpu.cc',
           'cpu.h',
           'debug_on_start.cc',
           'debug_on_start.h',
           'debug_util.cc',
           'debug_util.h',
           'debug_util_mac.cc',
-          'debug_util_posix.cc',
-          'debug_util_win.cc',
+          'debug/debugger.cc',
+          'debug/debugger.h',
+          'debug/debugger_posix.cc',
+          'debug/debugger_win.cc',
+          'debug/leak_annotations.h',
+          'debug/leak_tracker.h',
+          'debug/stack_trace.cc',
+          'debug/stack_trace.h',
+          'debug/stack_trace_posix.cc',
+          'debug/stack_trace_win.cc',
+          'debug/trace_event_win.cc',
+          'debug/trace_event.cc',
+          'debug/trace_event.h',
           'dir_reader_fallback.h',
           'dir_reader_linux.h',
           'dir_reader_posix.h',
           'environment.cc',
           'environment.h',
           'event_trace_consumer_win.h',
           'event_trace_controller_win.cc',
           'event_trace_controller_win.h',
           'event_trace_provider_win.cc',
           'event_trace_provider_win.h',
@@ skipping 24 matching lines @@
           'hash_tables.h',
           'id_map.h',
           'json/json_reader.cc',
           'json/json_reader.h',
           'json/json_writer.cc',
           'json/json_writer.h',
           'json/string_escape.cc',
           'json/string_escape.h',
           'lazy_instance.cc',
           'lazy_instance.h',
-          'leak_annotations.h',
-          'leak_tracker.h',
           'linked_list.h',
           'linked_ptr.h',
           'lock.cc',
           'lock.h',
           'lock_impl.h',
           'lock_impl_posix.cc',
           'lock_impl_win.cc',
           'logging.cc',
           'logging.h',
           'logging_win.cc',
@@ skipping 133 matching lines @@
           'thread_local_posix.cc',
           'thread_local_storage.h',
           'thread_local_storage_posix.cc',
           'thread_local_storage_win.cc',
           'thread_local_win.cc',
           'time.cc',
           'time.h',
           'time_win.cc',
           'timer.cc',
           'timer.h',
-          'trace_event_win.cc',
-          'trace_event.cc',
-          'trace_event.h',
           'tracked.cc',
           'tracked.h',
           'tracked_objects.cc',
           'tracked_objects.h',
           'tuple.h',
           'unix_domain_socket_posix.cc',
           'utf_offset_string_conversions.cc',
           'utf_offset_string_conversions.h',
           'utf_string_conversion_utils.cc',
           'utf_string_conversion_utils.h',
@@ skipping 95 matching lines @@
               '<(DEPTH)/third_party/wtl/include',
             ],
             'sources!': [
               'event_recorder_stubs.cc',
               'file_descriptor_shuffle.cc',
               'message_pump_libevent.cc',
               # Not using sha1_win.cc because it may have caused a
               # regression to page cycler moz.
               'sha1_win.cc',
               'string16.cc',
-              'trace_event.cc',
+              'debug/trace_event.cc',
             ],
           },],
         ],
       }],
       ['base_extra_target==1', {
         'sources': [
           'crypto/capi_util.cc',
           'crypto/capi_util.h',
           'crypto/cssm_init.cc',
           'crypto/cssm_init.h',
@@ skipping 349 matching lines @@
             'third_party/xdg_mime/xdgmimemagic.c',
             'third_party/xdg_mime/xdgmimemagic.h',
             'third_party/xdg_mime/xdgmimeparent.c',
             'third_party/xdg_mime/xdgmimeparent.h',
           ],
         },
       ],
     }],
   ],
 }