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

Side by Side Diff: chrome/browser/prefs/incognito_mode_prefs_unittest.cc

Issue 8373019: Disabled incognito death test on mac. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 2 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 | « no previous file | no next file » | 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 "chrome/browser/prefs/incognito_mode_prefs.h" 5 #include "chrome/browser/prefs/incognito_mode_prefs.h"
6 6
7 #include "chrome/common/pref_names.h" 7 #include "chrome/common/pref_names.h"
8 #include "chrome/test/base/testing_pref_service.h" 8 #include "chrome/test/base/testing_pref_service.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 10
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 IncognitoModePrefs::GetAvailability(&prefs_)); 48 IncognitoModePrefs::GetAvailability(&prefs_));
49 49
50 prefs_.SetUserPref(prefs::kIncognitoModeAvailability, 50 prefs_.SetUserPref(prefs::kIncognitoModeAvailability,
51 Value::CreateIntegerValue(IncognitoModePrefs::FORCED)); 51 Value::CreateIntegerValue(IncognitoModePrefs::FORCED));
52 EXPECT_EQ(IncognitoModePrefs::FORCED, 52 EXPECT_EQ(IncognitoModePrefs::FORCED,
53 IncognitoModePrefs::GetAvailability(&prefs_)); 53 IncognitoModePrefs::GetAvailability(&prefs_));
54 } 54 }
55 55
56 typedef IncognitoModePrefsTest IncognitoModePrefsDeathTest; 56 typedef IncognitoModePrefsTest IncognitoModePrefsDeathTest;
57 57
58 TEST_F(IncognitoModePrefsDeathTest, GetAvailabilityBadValue) { 58 // Takes too long to execute on Mac. http://crbug.com/101109
59 #if defined(OS_MACOSX)
60 #define MAYBE_GetAvailabilityBadValue DISABLED_GetAvailabilityBadValue
61 #else
62 #define MAYBE_GetAvailabilityBadValue GetAvailabilityBadValue
63 #endif
64
65 TEST_F(IncognitoModePrefsDeathTest, MAYBE_GetAvailabilityBadValue) {
59 prefs_.SetUserPref(prefs::kIncognitoModeAvailability, 66 prefs_.SetUserPref(prefs::kIncognitoModeAvailability,
60 Value::CreateIntegerValue(-1)); 67 Value::CreateIntegerValue(-1));
61 #if defined(NDEBUG) && defined(DCHECK_ALWAYS_ON) 68 #if defined(NDEBUG) && defined(DCHECK_ALWAYS_ON)
62 EXPECT_DEATH({ 69 EXPECT_DEATH({
63 IncognitoModePrefs::Availability availability = 70 IncognitoModePrefs::Availability availability =
64 IncognitoModePrefs::GetAvailability(&prefs_); 71 IncognitoModePrefs::GetAvailability(&prefs_);
65 EXPECT_EQ(IncognitoModePrefs::ENABLED, availability); 72 EXPECT_EQ(IncognitoModePrefs::ENABLED, availability);
66 }, ""); 73 }, "");
67 #else 74 #else
68 EXPECT_DEBUG_DEATH({ 75 EXPECT_DEBUG_DEATH({
69 IncognitoModePrefs::Availability availability = 76 IncognitoModePrefs::Availability availability =
70 IncognitoModePrefs::GetAvailability(&prefs_); 77 IncognitoModePrefs::GetAvailability(&prefs_);
71 EXPECT_EQ(IncognitoModePrefs::ENABLED, availability); 78 EXPECT_EQ(IncognitoModePrefs::ENABLED, availability);
72 }, ""); 79 }, "");
73 #endif 80 #endif
74 } 81 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698