| Index: chrome/browser/extensions/extensions_service_unittest.cc
|
| diff --git a/chrome/browser/extensions/extensions_service_unittest.cc b/chrome/browser/extensions/extensions_service_unittest.cc
|
| index 6df27a930998bac0b3c26bc826cdc03f08fdcf75..d9f29782a86b6915787f1398d77143904300e182 100644
|
| --- a/chrome/browser/extensions/extensions_service_unittest.cc
|
| +++ b/chrome/browser/extensions/extensions_service_unittest.cc
|
| @@ -1534,40 +1534,40 @@ TEST(ExtensionsServiceTestSimple, Enabledness) {
|
| FilePath install_dir = profile.GetPath()
|
| .AppendASCII(ExtensionsService::kInstallDirectoryName);
|
|
|
| - // By default, we are disabled.
|
| + // By default, we are enabled.
|
| command_line.reset(new CommandLine(L""));
|
| service = new ExtensionsService(&profile, command_line.get(),
|
| profile.GetPrefs(), install_dir, &loop, &loop, false);
|
| - EXPECT_FALSE(service->extensions_enabled());
|
| + EXPECT_TRUE(service->extensions_enabled());
|
| service->Init();
|
| loop.RunAllPending();
|
| EXPECT_TRUE(recorder.ready());
|
|
|
| - // If either the command line or pref is set, we are enabled.
|
| + // If either the command line or pref is set, we are disabled.
|
| recorder.set_ready(false);
|
| - command_line->AppendSwitch(switches::kEnableExtensions);
|
| + command_line->AppendSwitch(switches::kDisableExtensions);
|
| service = new ExtensionsService(&profile, command_line.get(),
|
| profile.GetPrefs(), install_dir, &loop, &loop, false);
|
| - EXPECT_TRUE(service->extensions_enabled());
|
| + EXPECT_FALSE(service->extensions_enabled());
|
| service->Init();
|
| loop.RunAllPending();
|
| - EXPECT_TRUE(recorder.ready());
|
| + EXPECT_FALSE(recorder.ready());
|
|
|
| recorder.set_ready(false);
|
| - profile.GetPrefs()->SetBoolean(prefs::kEnableExtensions, true);
|
| + profile.GetPrefs()->SetBoolean(prefs::kDisableExtensions, true);
|
| service = new ExtensionsService(&profile, command_line.get(),
|
| profile.GetPrefs(), install_dir, &loop, &loop, false);
|
| - EXPECT_TRUE(service->extensions_enabled());
|
| + EXPECT_FALSE(service->extensions_enabled());
|
| service->Init();
|
| loop.RunAllPending();
|
| - EXPECT_TRUE(recorder.ready());
|
| + EXPECT_FALSE(recorder.ready());
|
|
|
| recorder.set_ready(false);
|
| command_line.reset(new CommandLine(L""));
|
| service = new ExtensionsService(&profile, command_line.get(),
|
| profile.GetPrefs(), install_dir, &loop, &loop, false);
|
| - EXPECT_TRUE(service->extensions_enabled());
|
| + EXPECT_FALSE(service->extensions_enabled());
|
| service->Init();
|
| loop.RunAllPending();
|
| - EXPECT_TRUE(recorder.ready());
|
| + EXPECT_FALSE(recorder.ready());
|
| }
|
|
|