diff options
Diffstat (limited to 'chrome_frame/crash_reporting')
| -rw-r--r-- | chrome_frame/crash_reporting/minidump_test.cc | 9 | ||||
| -rw-r--r-- | chrome_frame/crash_reporting/nt_loader_unittest.cc | 10 |
2 files changed, 9 insertions, 10 deletions
diff --git a/chrome_frame/crash_reporting/minidump_test.cc b/chrome_frame/crash_reporting/minidump_test.cc index 106b4df..9b4ef22 100644 --- a/chrome_frame/crash_reporting/minidump_test.cc +++ b/chrome_frame/crash_reporting/minidump_test.cc @@ -1,7 +1,6 @@ -// 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. - #include <windows.h> #include <objbase.h> #include <dbghelp.h> @@ -12,7 +11,7 @@ #include "base/file_util.h" #include "base/file_version_info.h" #include "base/logging.h" -#include "base/win/scoped_handle.h" +#include "base/scoped_handle_win.h" #include "gtest/gtest.h" namespace { @@ -278,8 +277,8 @@ class MinidumpTest: public testing::Test { } protected: - base::win::ScopedHandle dump_file_handle_; - base::win::ScopedHandle dump_file_mapping_; + ScopedHandle dump_file_handle_; + ScopedHandle dump_file_mapping_; void* dump_file_view_; FilePath dump_file_; diff --git a/chrome_frame/crash_reporting/nt_loader_unittest.cc b/chrome_frame/crash_reporting/nt_loader_unittest.cc index eba363e..2d1f838 100644 --- a/chrome_frame/crash_reporting/nt_loader_unittest.cc +++ b/chrome_frame/crash_reporting/nt_loader_unittest.cc @@ -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. @@ -10,12 +10,12 @@ #include "base/at_exit.h" #include "base/environment.h" #include "base/message_loop.h" +#include "base/scoped_handle.h" #include "base/scoped_ptr.h" #include "base/string_util.h" #include "base/sys_info.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" -#include "base/win/scoped_handle.h" #include "chrome_frame/crash_reporting/crash_dll.h" #include "gtest/gtest.h" @@ -83,7 +83,7 @@ TEST(NtLoader, OwnsCriticalSection) { other.message_loop()->PostTask( FROM_HERE, NewRunnableFunction(::EnterCriticalSection, &cs)); - base::win::ScopedHandle event(::CreateEvent(NULL, FALSE, FALSE, NULL)); + ScopedHandle event(::CreateEvent(NULL, FALSE, FALSE, NULL)); other.message_loop()->PostTask( FROM_HERE, NewRunnableFunction(::SetEvent, event.Get())); @@ -125,8 +125,8 @@ TEST(NtLoader, OwnsLoaderLock) { TEST(NtLoader, GetLoaderEntry) { // Get all modules in the current process. - base::win::ScopedHandle snap( - ::CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, ::GetCurrentProcessId())); + ScopedHandle snap(::CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, + ::GetCurrentProcessId())); EXPECT_TRUE(snap.Get() != NULL); // Walk them, while checking we get an entry for each, and that it |