move base/object_watcher into base/win and add the win namespace. Fixup calle...

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,
     },
     'target_conditions': [
@@ skipping 132 matching lines @@
           'metrics/stats_counters.cc',
           'metrics/stats_counters.h',
           'metrics/stats_table.cc',
           'metrics/stats_table.h',
           'mime_util.h',
           'mime_util_xdg.cc',
           'native_library.h',
           'native_library_linux.cc',
           'native_library_mac.mm',
           'native_library_win.cc',
-          'object_watcher.cc',
-          'object_watcher.h',
           'observer_list.h',
           'observer_list_threadsafe.h',
           'path_service.cc',
           'path_service.h',
           'pickle.cc',
           'pickle.h',
           'platform_file.h',
           'platform_file_posix.cc',
           'platform_file_win.cc',
           'port.h',
@@ skipping 125 matching lines @@
           'waitable_event.h',
           'waitable_event_posix.cc',
           'waitable_event_watcher.h',
           'waitable_event_watcher_posix.cc',
           'waitable_event_watcher_win.cc',
           'waitable_event_win.cc',
           'weak_ptr.cc',
           'weak_ptr.h',
           'win/i18n.cc',
           'win/i18n.h',
+          'win/object_watcher.cc',
+          'win/object_watcher.h',
           'win/pe_image.cc',
           'win/event_trace_consumer.h',
           'win/event_trace_controller.cc',
           'win/event_trace_controller.h',
           'win/event_trace_provider.cc',
           'win/event_trace_provider.h',
           'win/pe_image.h',
           'win/registry.cc',
           'win/registry.h',
           'win/scoped_bstr.cc',
@@ skipping 196 matching lines @@
             'sources!': [
               'third_party/purify/pure_api.c',
               'base_drag_source.cc',
               'base_drop_target.cc',
               'cpu.cc',
               'crypto/capi_util.h',
               'crypto/capi_util.cc',
               'debug_on_start.cc',
               'event_recorder.cc',
               'file_version_info.cc',
-              'object_watcher.cc',
               'pe_image.cc',
               'registry.cc',
               'resource_util.cc',
               'win_util.cc',
             ],
         },],
         [ 'use_openssl==1', {
             # TODO(joth): Use a glob to match exclude patterns once the
             #             OpenSSL file set is complete.
             'sources!': [
@@ skipping 201 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',
           ],
         },
       ],
     }],
   ],
 }