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

chrome/common/service_process_util_win.cc

 // 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.
 
 #include "chrome/common/service_process_util.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
-#include "base/object_watcher.h"
 #include "base/path_service.h"
 #include "base/scoped_handle_win.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
+#include "base/win/object_watcher.h"
 #include "base/win/win_util.h"
 #include "chrome/common/chrome_switches.h"
 
 namespace {
 
 string16 GetServiceProcessReadyEventName() {
   return UTF8ToWide(
       GetServiceProcessScopedVersionedName("_service_ready"));
 }
 
 string16 GetServiceProcessShutdownEventName() {
   return UTF8ToWide(
       GetServiceProcessScopedVersionedName("_service_shutdown_evt"));
 }
 
-class ServiceProcessShutdownMonitor : public base::ObjectWatcher::Delegate {
+class ServiceProcessShutdownMonitor
+    : public base::win::ObjectWatcher::Delegate {
  public:
   explicit ServiceProcessShutdownMonitor(Task* shutdown_task)
       : shutdown_task_(shutdown_task) {
   }
   void Start() {
     string16 event_name = GetServiceProcessShutdownEventName();
     CHECK(event_name.length() <= MAX_PATH);
     shutdown_event_.Set(CreateEvent(NULL, TRUE, FALSE, event_name.c_str()));
     watcher_.StartWatching(shutdown_event_.Get(), this);
   }
 
   // base::ObjectWatcher::Delegate implementation.
   virtual void OnObjectSignaled(HANDLE object) {
     shutdown_task_->Run();
     shutdown_task_.reset();
   }
 
  private:
   ScopedHandle shutdown_event_;
-  base::ObjectWatcher watcher_;
+  base::win::ObjectWatcher watcher_;
   scoped_ptr<Task> shutdown_task_;
 };
 
 }  // namespace
 
 bool ForceServiceProcessShutdown(const std::string& version) {
   ScopedHandle shutdown_event;
   std::string versioned_name = version;
   versioned_name.append("_service_shutdown_evt");
   string16 event_name =
@@ skipping 75 matching lines @@
 }
 
 void ServiceProcessState::TearDownState() {
   delete state_;
   state_ = NULL;
 }
 
 bool ServiceProcessState::ShouldHandleOtherVersion() {
   return true;
 }