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

Side by Side Diff: chrome/browser/chrome_browser_main_unittest.cc

Issue 7719007: Add a gyp flag to enable dcheck by default in release without (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 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 | Annotate | Revision Log
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/prefs/incognito_mode_prefs_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <string> 5 #include <string>
6 #include <vector> 6 #include <vector>
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "chrome/browser/chrome_browser_main.h" 9 #include "chrome/browser/chrome_browser_main.h"
10 #include "chrome/browser/chrome_content_browser_client.h" 10 #include "chrome/browser/chrome_content_browser_client.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 // ContentClient interfaces. 70 // ContentClient interfaces.
71 scoped_ptr<content::BrowserMainParts> bw; 71 scoped_ptr<content::BrowserMainParts> bw;
72 if (content::GetContentClient()) { 72 if (content::GetContentClient()) {
73 bw.reset(content::GetContentClient()->browser()->CreateBrowserMainParts( 73 bw.reset(content::GetContentClient()->browser()->CreateBrowserMainParts(
74 *params)); 74 *params));
75 } else { 75 } else {
76 chrome::ChromeContentBrowserClient ccbc; 76 chrome::ChromeContentBrowserClient ccbc;
77 bw.reset(ccbc.CreateBrowserMainParts(*params)); 77 bw.reset(ccbc.CreateBrowserMainParts(*params));
78 } 78 }
79 ChromeBrowserMainParts* cbw = static_cast<ChromeBrowserMainParts*>(bw.get()); 79 ChromeBrowserMainParts* cbw = static_cast<ChromeBrowserMainParts*>(bw.get());
80 #if defined(NDEBUG) && defined(DCHECK_ALWAYS_ON)
81 EXPECT_DEATH(cbw->WarmConnectionFieldTrial(),
82 "Not a valid socket reuse policy group");
83 #else
80 EXPECT_DEBUG_DEATH(cbw->WarmConnectionFieldTrial(), 84 EXPECT_DEBUG_DEATH(cbw->WarmConnectionFieldTrial(),
81 "Not a valid socket reuse policy group"); 85 "Not a valid socket reuse policy group");
86 #endif
82 } 87 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/prefs/incognito_mode_prefs_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698