Remove base/scoped_handle_win.h stub and fix up all callers to use the new location and namespace.

chrome/common/service_process_util_win.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/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/scoped_handle.h"

[brettw, 2011/01/07 18:03:46]

Got some extra indentation.

[tfarina, 2011/01/07 22:23:08]

Done.

 #include "base/win/win_util.h"
 #include "chrome/common/chrome_switches.h"
 
 namespace {
 
 string16 GetServiceProcessReadyEventName() {
   return UTF8ToWide(
       GetServiceProcessScopedVersionedName("_service_ready"));
 }
 
@@ skipping 15 matching lines @@
     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::win::ScopedHandle shutdown_event_;
   base::win::ObjectWatcher watcher_;
   scoped_ptr<Task> shutdown_task_;
 };
 
 }  // namespace
 
 bool ForceServiceProcessShutdown(const std::string& version) {
-  ScopedHandle shutdown_event;
+  base::win::ScopedHandle shutdown_event;
   std::string versioned_name = version;
   versioned_name.append("_service_shutdown_evt");
   string16 event_name =
       UTF8ToWide(GetServiceProcessScopedName(versioned_name));
   shutdown_event.Set(OpenEvent(EVENT_MODIFY_STATE, FALSE, event_name.c_str()));
   if (!shutdown_event.IsValid())
     return false;
   SetEvent(shutdown_event.Get());
   return true;
 }
 
 bool CheckServiceProcessReady() {
   string16 event_name = GetServiceProcessReadyEventName();
-  ScopedHandle event(
+  base::win::ScopedHandle event(
       OpenEvent(SYNCHRONIZE | READ_CONTROL, false, event_name.c_str()));
   if (!event.IsValid())
     return false;
   // Check if the event is signaled.
   return WaitForSingleObject(event, 0) == WAIT_OBJECT_0;
 }
 
 struct ServiceProcessState::StateData {
   // An event that is signaled when a service process is ready.
-  ScopedHandle ready_event;
+  base::win::ScopedHandle ready_event;
   scoped_ptr<ServiceProcessShutdownMonitor> shutdown_monitor;
 };
 
 bool ServiceProcessState::TakeSingletonLock() {
   DCHECK(!state_);
   string16 event_name = GetServiceProcessReadyEventName();
   CHECK(event_name.length() <= MAX_PATH);
-  ScopedHandle service_process_ready_event;
+  base::win::ScopedHandle service_process_ready_event;
   service_process_ready_event.Set(
       CreateEvent(NULL, TRUE, FALSE, event_name.c_str()));
   DWORD error = GetLastError();
   if ((error == ERROR_ALREADY_EXISTS) || (error == ERROR_ACCESS_DENIED))
     return false;
   DCHECK(service_process_ready_event.IsValid());
   state_ = new StateData;
   state_->ready_event.Set(service_process_ready_event.Take());
   return true;
 }
@@ skipping 36 matching lines @@
 }
 
 void ServiceProcessState::TearDownState() {
   delete state_;
   state_ = NULL;
 }
 
 bool ServiceProcessState::ShouldHandleOtherVersion() {
   return true;
 }