GN: fix bootstrap.py due to recent changes in //base

tools/gn/bootstrap/bootstrap.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 """Bootstraps gn.
 
 It is done by first building it manually in a temporary directory, then building
 it with its own BUILD.gn to the final destination.
 """
@@ skipping 132 matching lines @@
   ])
   static_libraries['base']['sources'].extend([
       'base/at_exit.cc',
       'base/atomicops_internals_x86_gcc.cc',
       'base/base_paths.cc',
       'base/base_switches.cc',
       'base/callback_internal.cc',
       'base/command_line.cc',
       'base/debug/alias.cc',
       'base/debug/stack_trace.cc',
+      'base/debug/task_annotator.cc',
       'base/debug/trace_event_impl.cc',
       'base/debug/trace_event_impl_constants.cc',
       'base/debug/trace_event_memory.cc',
       'base/debug/trace_event_synthetic_delay.cc',
       'base/environment.cc',
-      'base/file_util.cc',
       'base/files/file.cc',
       'base/files/file_enumerator.cc',
       'base/files/file_path.cc',
       'base/files/file_path_constants.cc',
+      'base/files/file_util.cc',
       'base/files/scoped_file.cc',
       'base/json/json_parser.cc',
       'base/json/json_reader.cc',
       'base/json/json_string_value_serializer.cc',
       'base/json/json_writer.cc',
       'base/json/string_escape.cc',
       'base/lazy_instance.cc',
       'base/location.cc',
       'base/logging.cc',
       'base/memory/ref_counted.cc',
@@ skipping 59 matching lines @@
       'base/tracking_info.cc',
       'base/values.cc',
       'base/vlog.cc',
   ])
 
   if is_posix:
     static_libraries['base']['sources'].extend([
         'base/base_paths_posix.cc',
         'base/debug/debugger_posix.cc',
         'base/debug/stack_trace_posix.cc',
-        'base/file_util_posix.cc',
         'base/files/file_enumerator_posix.cc',
         'base/files/file_posix.cc',
+        'base/files/file_util_posix.cc',
         'base/message_loop/message_pump_libevent.cc',
         'base/posix/file_descriptor_shuffle.cc',
         'base/process/kill_posix.cc',
         'base/process/process_handle_posix.cc',
         'base/process/process_metrics_posix.cc',
         'base/process/process_posix.cc',
         'base/safe_strerror_posix.cc',
         'base/synchronization/condition_variable_posix.cc',
         'base/synchronization/lock_impl_posix.cc',
         'base/synchronization/waitable_event_posix.cc',
@@ skipping 50 matching lines @@
         os.path.join(SRC_ROOT, 'third_party', 'libevent', 'linux')
     ])
     static_libraries['libevent']['sources'].extend([
         'third_party/libevent/epoll.c',
     ])
 
 
   if is_mac:
     static_libraries['base']['sources'].extend([
         'base/base_paths_mac.mm',
-        'base/file_util_mac.mm',
+        'base/files/file_util_mac.mm',
         'base/mac/bundle_locations.mm',
         'base/mac/foundation_util.mm',
         'base/mac/mach_logging.cc',
         'base/mac/scoped_mach_port.cc',
         'base/mac/scoped_nsautorelease_pool.mm',
         'base/message_loop/message_pump_mac.mm',
         'base/process/process_handle_mac.cc',
         'base/process/process_iterator_mac.cc',
         'base/strings/sys_string_conversions_mac.mm',
         'base/time/time_mac.cc',
@@ skipping 77 matching lines @@
     cmd.append('-v')
   cmd.append('gn')
   check_call(cmd)
 
   if not debug:
     check_call(['strip', os.path.join(build_dir, 'gn')])
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))