summaryrefslogtreecommitdiffstats
path: root/chrome_frame/crash_reporting/minidump_test.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/crash_reporting/minidump_test.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/crash_reporting/minidump_test.cc')
-rw-r--r--chrome_frame/crash_reporting/minidump_test.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome_frame/crash_reporting/minidump_test.cc b/chrome_frame/crash_reporting/minidump_test.cc
index 9b4ef22..106b4df 100644
--- a/chrome_frame/crash_reporting/minidump_test.cc
+++ b/chrome_frame/crash_reporting/minidump_test.cc
@@ -1,6 +1,7 @@
-// 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 <windows.h>
#include <objbase.h>
#include <dbghelp.h>
@@ -11,7 +12,7 @@
#include "base/file_util.h"
#include "base/file_version_info.h"
#include "base/logging.h"
-#include "base/scoped_handle_win.h"
+#include "base/win/scoped_handle.h"
#include "gtest/gtest.h"
namespace {
@@ -277,8 +278,8 @@ class MinidumpTest: public testing::Test {
}
protected:
- ScopedHandle dump_file_handle_;
- ScopedHandle dump_file_mapping_;
+ base::win::ScopedHandle dump_file_handle_;
+ base::win::ScopedHandle dump_file_mapping_;
void* dump_file_view_;
FilePath dump_file_;