| OLD | NEW | 
|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include <atlbase.h> | 5 #include <atlbase.h> | 
| 6 | 6 | 
| 7 #include "base/environment.h" | 7 #include "base/environment.h" | 
| 8 #include "base/logging.h" |  | 
| 9 #include "base/scoped_ptr.h" | 8 #include "base/scoped_ptr.h" | 
| 10 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" | 
| 11 #include "chrome_frame/crash_reporting/crash_dll.h" | 10 #include "chrome_frame/crash_reporting/crash_dll.h" | 
| 12 #include "chrome_frame/crash_reporting/nt_loader.h" | 11 #include "chrome_frame/crash_reporting/nt_loader.h" | 
| 13 #include "chrome_frame/crash_reporting/vectored_handler-impl.h" | 12 #include "chrome_frame/crash_reporting/vectored_handler-impl.h" | 
| 14 #include "chrome_frame/crash_reporting/veh_test.h" | 13 #include "chrome_frame/crash_reporting/veh_test.h" | 
| 15 #include "testing/gmock/include/gmock/gmock.h" | 14 #include "testing/gmock/include/gmock/gmock.h" | 
| 16 #include "testing/gtest/include/gtest/gtest.h" | 15 #include "testing/gtest/include/gtest/gtest.h" | 
| 17 | 16 | 
| 18 using testing::_; | 17 using testing::_; | 
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 220 | 219 | 
| 221   DWORD tid; | 220   DWORD tid; | 
| 222   HANDLE h = ::CreateThread(0, 0, CrashingThread, 0, 0, &tid); | 221   HANDLE h = ::CreateThread(0, 0, CrashingThread, 0, 0, &tid); | 
| 223   ::WaitForSingleObject(h, INFINITE); | 222   ::WaitForSingleObject(h, INFINITE); | 
| 224   ::CloseHandle(h); | 223   ::CloseHandle(h); | 
| 225 | 224 | 
| 226   EXPECT_EQ(2, veh.get_exceptions_seen()); | 225   EXPECT_EQ(2, veh.get_exceptions_seen()); | 
| 227   ::RemoveVectoredExceptionHandler(id); | 226   ::RemoveVectoredExceptionHandler(id); | 
| 228   g_mock_veh = NULL; | 227   g_mock_veh = NULL; | 
| 229 } | 228 } | 
| OLD | NEW | 
|---|