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

Unified Diff: chrome/browser/protector/prefs_backup_invalid_change_unittest.cc

Issue 10717005: Fix: PrefsBackupInvalidChangeTest.Defaults on Mac Lion. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: code review Created 8 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/protector/prefs_backup_invalid_change_unittest.cc
diff --git a/chrome/browser/protector/prefs_backup_invalid_change_unittest.cc b/chrome/browser/protector/prefs_backup_invalid_change_unittest.cc
index 17b21cee08c1555922882e4ff786315f37b7657c..e943873b6e2ee70de7a5672b3974d0371776dd4d 100644
--- a/chrome/browser/protector/prefs_backup_invalid_change_unittest.cc
+++ b/chrome/browser/protector/prefs_backup_invalid_change_unittest.cc
@@ -24,15 +24,18 @@ const char kStartupUrl[] = "http://example.com/";
class PrefsBackupInvalidChangeTest : public testing::Test {
protected:
+ virtual void SetUp() OVERRIDE {
+ // Make the tests independent of the Mac startup pref migration (see
+ // SessionStartupPref::MigrateMacDefaultPrefIfNecessary).
+ PrefService* prefs = profile_.GetPrefs();
+ prefs->SetString(prefs::kProfileCreatedByVersion, "22.0.0.0.0");
+ }
+
TestingProfile profile_;
};
// Test that correct default values are applied by Init.
TEST_F(PrefsBackupInvalidChangeTest, Defaults) {
-#if defined(OS_MACOSX)
- if (base::mac::IsOSLionOrLater())
- FAIL() << "Broken after r142958; http://crbug.com/134186";
-#endif
SessionStartupPref startup_pref(SessionStartupPref::URLS);
startup_pref.urls.push_back(GURL(kStartupUrl));
SessionStartupPref::SetStartupPref(&profile_, startup_pref);
« 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