summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/ie_event_sink.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-09 16:32:20 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-09 16:32:20 +0000
commitb90d7e80c20c7c20831bedfe3fa6028ddab1ae95 (patch)
tree308e927055c27a533019d329a9677ce8e7c53e33 /chrome_frame/test/ie_event_sink.cc
parentd716d4178136a223e9e79b3508c755a71108a068 (diff)
downloadchromium_src-b90d7e80c20c7c20831bedfe3fa6028ddab1ae95.zip
chromium_src-b90d7e80c20c7c20831bedfe3fa6028ddab1ae95.tar.gz
chromium_src-b90d7e80c20c7c20831bedfe3fa6028ddab1ae95.tar.bz2
Reland "Remove base/scoped_handle_win.h."
Fixed the problem with rlz library. Now should be fine to land this again. This reverts commit 3620d9501af7bff688862c54fdd60f7eb41797f3. Original Review URL: http://codereview.chromium.org/6126002/ BUG=None TEST=trybots Review URL: http://codereview.chromium.org/6110005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70861 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/ie_event_sink.cc')
-rw-r--r--chrome_frame/test/ie_event_sink.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome_frame/test/ie_event_sink.cc b/chrome_frame/test/ie_event_sink.cc
index 1649e2a..c570558 100644
--- a/chrome_frame/test/ie_event_sink.cc
+++ b/chrome_frame/test/ie_event_sink.cc
@@ -1,14 +1,14 @@
-// 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_frame/test/ie_event_sink.h"
-#include "base/scoped_handle.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/utf_string_conversions.h"
#include "base/win/scoped_bstr.h"
+#include "base/win/scoped_handle.h"
#include "base/win/scoped_variant.h"
#include "chrome_frame/test/chrome_frame_test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -147,9 +147,8 @@ void IEEventSink::Uninitialize() {
web_browser2_->Quit();
}
- ScopedHandle process;
- process.Set(OpenProcess(SYNCHRONIZE, FALSE,
- ie_process_id_));
+ base::win::ScopedHandle process;
+ process.Set(OpenProcess(SYNCHRONIZE, FALSE, ie_process_id_));
web_browser2_.Release();
if (!process.IsValid()) {