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

base/win/event_trace_controller_unittest.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.
 //
 // Unit tests for event trace controller.
-#include "base/win/event_trace_controller.h"
-#include "base/win/event_trace_provider.h"
+
+#include <initguid.h>  // NOLINT - must be last.

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

You moved this and the comment says it must be last. If this compiles, then
great, remove the comment. If there's some problem and the comment is correct,
you should probably leave it where it was.

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

Done.

+
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
-#include "base/scoped_handle.h"
 #include "base/sys_info.h"
+#include "base/win/event_trace_controller.h"
+#include "base/win/event_trace_provider.h"
+#include "base/win/scoped_handle.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include <initguid.h>  // NOLINT - must be last.
 
 namespace {
 
 using base::win::EtwTraceController;
 using base::win::EtwTraceProvider;
 using base::win::EtwTraceProperties;
 
 const wchar_t kTestSessionName[] = L"TestLogSession";
 
 // {0D236A42-CD18-4e3d-9975-DCEEA2106E05}
@@ skipping 18 matching lines @@
   }
 
  private:
   virtual void OnEventsEnabled() {
     ::SetEvent(callback_event_.Get());
   }
   virtual void PostEventsDisabled() {
     ::SetEvent(callback_event_.Get());
   }
 
-  ScopedHandle callback_event_;
+  base::win::ScopedHandle callback_event_;
 
   DISALLOW_COPY_AND_ASSIGN(TestingProvider);
 };
 
 }  // namespace
 
 TEST(EtwTraceTest, Cleanup) {
   // Clean up potential leftover sessions from previous unsuccessful runs.
   EtwTraceProperties ignore;
   EtwTraceController::Stop(kTestSessionName, &ignore);
@@ skipping 135 matching lines @@
   EXPECT_EQ(kTestProviderFlags, provider.enable_flags());
 
   EXPECT_HRESULT_SUCCEEDED(controller.Stop(NULL));
 
   provider.WaitForCallback();
 
   // Session should have wound down.
   EXPECT_EQ(0, provider.enable_level());
   EXPECT_EQ(0, provider.enable_flags());
 }