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

Unified Diff: chrome/browser/extensions/extensions_service_unittest.cc

Issue 190010: Revert 24846 - Enable extensions by default.... (Closed) Base URL: svn://chrome-svn/chrome/branches/205/src/
Patch Set: Created 11 years, 4 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 | « chrome/browser/extensions/extensions_service.cc ('k') | chrome/browser/profile.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extensions_service_unittest.cc
===================================================================
--- chrome/browser/extensions/extensions_service_unittest.cc (revision 25203)
+++ chrome/browser/extensions/extensions_service_unittest.cc (working copy)
@@ -1534,30 +1534,30 @@
FilePath install_dir = profile.GetPath()
.AppendASCII(ExtensionsService::kInstallDirectoryName);
- // By default, we are enabled.
+ // By default, we are disabled.
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());
- // If either the command line or pref is set, we are disabled.
+ // If either the command line or pref is set, we are enabled.
recorder.set_ready(false);
- command_line->AppendSwitch(switches::kDisableExtensions);
+ command_line->AppendSwitch(switches::kEnableExtensions);
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());
recorder.set_ready(false);
- profile.GetPrefs()->SetBoolean(prefs::kDisableExtensions, true);
+ profile.GetPrefs()->SetBoolean(prefs::kEnableExtensions, true);
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());
@@ -1566,7 +1566,7 @@
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());
« no previous file with comments | « chrome/browser/extensions/extensions_service.cc ('k') | chrome/browser/profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698