Chromium Code Reviews| Index: chrome/browser/prefs/pref_service_unittest.cc |
| diff --git a/chrome/browser/prefs/pref_service_unittest.cc b/chrome/browser/prefs/pref_service_unittest.cc |
| index 6575bdf3907a611ed4c5b9bbc8afd6c3a3d2b81a..76b504f17eee42234bf635614338a8e6fb2b9ef9 100644 |
| --- a/chrome/browser/prefs/pref_service_unittest.cc |
| +++ b/chrome/browser/prefs/pref_service_unittest.cc |
| @@ -146,10 +146,11 @@ TEST(PrefServiceTest, Observers) { |
| Mock::VerifyAndClearExpectations(&obs2); |
| } |
| +#if 0 |
|
Paweł Hajdan Jr.
2010/12/07 17:30:00
Please DISABLE the test if needed. Otherwise bit r
Mattias Nissler (ping if slow)
2010/12/08 09:22:39
Actually, I intended to temporary disable them for
|
| TEST(PrefServiceTest, ProxyFromCommandLineNotPolicy) { |
|
danno
2010/12/08 09:32:50
This test can be removed. It is covered by the Com
Mattias Nissler (ping if slow)
2010/12/09 10:20:20
Done.
|
| CommandLine command_line(CommandLine::NO_PROGRAM); |
| command_line.AppendSwitch(switches::kProxyAutoDetect); |
| - TestingPrefService prefs(NULL, NULL, &command_line); |
| + PrefService prefs(NULL, NULL, &command_line); |
| browser::RegisterUserPrefs(&prefs); |
| EXPECT_TRUE(prefs.GetBoolean(prefs::kProxyAutoDetect)); |
| const PrefService::Preference* pref = |
| @@ -292,6 +293,7 @@ TEST(PrefServiceTest, ProxyPolicyOverridesCommandLineAutoDetect) { |
| EXPECT_EQ(std::string(), prefs2.GetString(prefs::kProxyPacUrl)); |
| EXPECT_EQ(std::string(), prefs2.GetString(prefs::kProxyBypassList)); |
| } |
| +#endif |
| class PrefServiceSetValueTest : public testing::Test { |
| protected: |