diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-08 23:03:59 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-08 23:03:59 +0000 |
| commit | b45c7d8e06b0f039290a6eaf556c40a5e2ca4c51 (patch) | |
| tree | 88b31a9da9099bdd3a5189d2e3bd0e89df9fd39b /chrome/browser/chrome_browser_main_unittest.cc | |
| parent | 751d4f80744a0672090adac89cf6efdc71c04f25 (diff) | |
| download | chromium_src-b45c7d8e06b0f039290a6eaf556c40a5e2ca4c51.zip chromium_src-b45c7d8e06b0f039290a6eaf556c40a5e2ca4c51.tar.gz chromium_src-b45c7d8e06b0f039290a6eaf556c40a5e2ca4c51.tar.bz2 | |
Fix unit_tests compile eror in chrome_browser_main_unittest.cc for Android
Add GTEST_HAS_DEATH_TEST guard
BUG=117407
TEST=
Review URL: http://codereview.chromium.org/9641024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125711 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_main_unittest.cc')
| -rw-r--r-- | chrome/browser/chrome_browser_main_unittest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/chrome_browser_main_unittest.cc b/chrome/browser/chrome_browser_main_unittest.cc index f5c549b..c880480 100644 --- a/chrome/browser/chrome_browser_main_unittest.cc +++ b/chrome/browser/chrome_browser_main_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -57,7 +57,7 @@ TEST_F(BrowserMainTest, WarmConnectionFieldTrial_Random) { } } } - +#if GTEST_HAS_DEATH_TEST TEST_F(BrowserMainTest, WarmConnectionFieldTrial_Invalid) { command_line_.AppendSwitchASCII(switches::kSocketReusePolicy, "100"); @@ -85,3 +85,4 @@ TEST_F(BrowserMainTest, WarmConnectionFieldTrial_Invalid) { #endif } } +#endif |