| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/browser/browser_main.h" | 5 #include "chrome/browser/browser_main.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "chrome/common/chrome_switches.h" | 10 #include "chrome/common/chrome_switches.h" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 } | 56 } |
| 57 | 57 |
| 58 TEST_F(BrowserMainTest, WarmConnectionFieldTrial_Invalid) { | 58 TEST_F(BrowserMainTest, WarmConnectionFieldTrial_Invalid) { |
| 59 command_line_.AppendSwitchASCII(switches::kSocketReusePolicy, "100"); | 59 command_line_.AppendSwitchASCII(switches::kSocketReusePolicy, "100"); |
| 60 | 60 |
| 61 scoped_ptr<MainFunctionParams> params( | 61 scoped_ptr<MainFunctionParams> params( |
| 62 new MainFunctionParams(command_line_, *sandbox_init_wrapper_, NULL)); | 62 new MainFunctionParams(command_line_, *sandbox_init_wrapper_, NULL)); |
| 63 scoped_ptr<BrowserMainParts> bw(BrowserMainParts::CreateBrowserMainParts( | 63 scoped_ptr<BrowserMainParts> bw(BrowserMainParts::CreateBrowserMainParts( |
| 64 *params)); | 64 *params)); |
| 65 | 65 |
| 66 #if defined(NDEBUG) && defined(DCHECK_ALWAYS_ON) |
| 67 EXPECT_DEATH(bw->WarmConnectionFieldTrial(), |
| 68 "Not a valid socket reuse policy group"); |
| 69 #else |
| 66 EXPECT_DEBUG_DEATH(bw->WarmConnectionFieldTrial(), | 70 EXPECT_DEBUG_DEATH(bw->WarmConnectionFieldTrial(), |
| 67 "Not a valid socket reuse policy group"); | 71 "Not a valid socket reuse policy group"); |
| 72 #endif |
| 68 } | 73 } |
| OLD | NEW |