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

This reverts r 70795, it broke the build.

TBR=vandebo

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70802 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 7 deletions

diff --git a/media/audio/win/wavein_input_win.h b/media/audio/win/wavein_input_win.h
index 5cc8913..7dd4781 100644
--- a/media/audio/win/wavein_input_win.h
+++ b/media/audio/win/wavein_input_win.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -9,7 +9,7 @@
 #include <mmsystem.h>
 
 #include "base/basictypes.h"
-#include "base/win/scoped_handle.h"
+#include "base/scoped_handle_win.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_parameters.h"
 
@@ -93,7 +93,7 @@ class PCMWaveInAudioInputStream : public AudioInputStream {
   WAVEHDR* buffer_;
 
   // An event that is signaled when the callback thread is ready to stop.
-  base::win::ScopedHandle stopped_event_;
+  ScopedHandle stopped_event_;
 
   DISALLOW_COPY_AND_ASSIGN(PCMWaveInAudioInputStream);
 };
diff --git a/media/audio/win/waveout_output_win.h b/media/audio/win/waveout_output_win.h
index 74717a0..651c9d2 100644
--- a/media/audio/win/waveout_output_win.h
+++ b/media/audio/win/waveout_output_win.h
@@ -1,17 +1,16 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
 #ifndef MEDIA_AUDIO_WIN_WAVEOUT_OUTPUT_WIN_H_
 #define MEDIA_AUDIO_WIN_WAVEOUT_OUTPUT_WIN_H_
-#pragma once
 
 #include <windows.h>
 #include <mmsystem.h>
 #include <mmreg.h>
 
 #include "base/basictypes.h"
-#include "base/win/scoped_handle.h"
+#include "base/scoped_handle_win.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_parameters.h"
 
@@ -111,7 +110,7 @@ class PCMWaveOutAudioOutputStream : public AudioOutputStream {
   WAVEHDR* buffer_;
 
   // An event that is signaled when the callback thread is ready to stop.
-  base::win::ScopedHandle stopped_event_;
+  ScopedHandle stopped_event_;
 
   DISALLOW_COPY_AND_ASSIGN(PCMWaveOutAudioOutputStream);
 };