Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(191)

Side by Side Diff: src/client/windows/unittests/crash_generation_server_test.cc

Issue 1353893002: Fix MSVC build (including on 2015), drop some workarounds for MSVC older than 2013. (Closed) Base URL: https://chromium.googlesource.com/breakpad/breakpad.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2010, Google Inc. 1 // Copyright 2010, Google Inc.
2 // All rights reserved. 2 // All rights reserved.
3 // 3 //
4 // Redistribution and use in source and binary forms, with or without 4 // Redistribution and use in source and binary forms, with or without
5 // modification, are permitted provided that the following conditions are 5 // modification, are permitted provided that the following conditions are
6 // met: 6 // met:
7 // 7 //
8 // * Redistributions of source code must retain the above copyright 8 // * Redistributions of source code must retain the above copyright
9 // notice, this list of conditions and the following disclaimer. 9 // notice, this list of conditions and the following disclaimer.
10 // * Redistributions in binary form must reproduce the above 10 // * Redistributions in binary form must reproduce the above
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 const DWORD kPipeDesiredAccess = FILE_READ_DATA | 44 const DWORD kPipeDesiredAccess = FILE_READ_DATA |
45 FILE_WRITE_DATA | 45 FILE_WRITE_DATA |
46 FILE_WRITE_ATTRIBUTES; 46 FILE_WRITE_ATTRIBUTES;
47 47
48 const DWORD kPipeFlagsAndAttributes = SECURITY_IDENTIFICATION | 48 const DWORD kPipeFlagsAndAttributes = SECURITY_IDENTIFICATION |
49 SECURITY_SQOS_PRESENT; 49 SECURITY_SQOS_PRESENT;
50 50
51 const DWORD kPipeMode = PIPE_READMODE_MESSAGE; 51 const DWORD kPipeMode = PIPE_READMODE_MESSAGE;
52 52
53 int kCustomInfoCount = 2; 53 size_t kCustomInfoCount = 2;
Mark Mentovai 2015/09/29 17:40:19 const. Or get rid of this and subsitute arraysize(
54 54
55 google_breakpad::CustomInfoEntry kCustomInfoEntries[] = { 55 google_breakpad::CustomInfoEntry kCustomInfoEntries[] = {
Mark Mentovai 2015/09/29 17:40:20 const
56 google_breakpad::CustomInfoEntry(L"prod", L"CrashGenerationServerTest"), 56 google_breakpad::CustomInfoEntry(L"prod", L"CrashGenerationServerTest"),
57 google_breakpad::CustomInfoEntry(L"ver", L"1.0"), 57 google_breakpad::CustomInfoEntry(L"ver", L"1.0"),
58 }; 58 };
59 59
60 class CrashGenerationServerTest : public ::testing::Test { 60 class CrashGenerationServerTest : public ::testing::Test {
61 public: 61 public:
62 CrashGenerationServerTest() 62 CrashGenerationServerTest()
63 : crash_generation_server_(kPipeName, 63 : crash_generation_server_(kPipeName,
64 NULL, 64 NULL,
65 CallOnClientConnected, &mock_callbacks_, 65 CallOnClientConnected, &mock_callbacks_,
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 ASSERT_NO_FATAL_FAILURE(FaultyClient(CLOSE_AFTER_CONNECT)); 297 ASSERT_NO_FATAL_FAILURE(FaultyClient(CLOSE_AFTER_CONNECT));
298 298
299 EXPECT_CALL(mock_callbacks_, OnClientConnected(_)); 299 EXPECT_CALL(mock_callbacks_, OnClientConnected(_));
300 ASSERT_NO_FATAL_FAILURE(FaultyClient(NO_FAULT)); 300 ASSERT_NO_FATAL_FAILURE(FaultyClient(NO_FAULT));
301 301
302 // See DoTestFault for an explanation of this line 302 // See DoTestFault for an explanation of this line
303 ASSERT_NO_FATAL_FAILURE(FaultyClient(CLOSE_AFTER_CONNECT)); 303 ASSERT_NO_FATAL_FAILURE(FaultyClient(CLOSE_AFTER_CONNECT));
304 } 304 }
305 305
306 } // anonymous namespace 306 } // anonymous namespace
OLDNEW
« no previous file with comments | « src/client/windows/unittests/client_tests.gyp ('k') | src/google_breakpad/common/breakpad_types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698