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

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

Issue 10626007: Move ExtensionSystem into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Master merge; moved class declaration Created 8 years, 5 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
Index: chrome/browser/extensions/extension_service_unittest.cc
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index eada4ca1dbd45c5dc4c6e051ab973e36df318f72..9465c8923cda45c560256591111e3ac4d38cef2e 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -101,6 +101,7 @@ using extensions::APIPermissionSet;
using extensions::Extension;
using extensions::ExtensionCreator;
using extensions::ExtensionPrefs;
+using extensions::ExtensionSystem;
using extensions::PermissionSet;
namespace keys = extension_manifest_keys;
@@ -422,7 +423,7 @@ void ExtensionServiceTestBase::InitializeExtensionService(
profile_.reset(profile);
- service_ = static_cast<TestExtensionSystem*>(
+ service_ = static_cast<extensions::TestExtensionSystem*>(
ExtensionSystem::Get(profile))->CreateExtensionService(
CommandLine::ForCurrentProcess(),
extensions_install_dir,
@@ -430,7 +431,7 @@ void ExtensionServiceTestBase::InitializeExtensionService(
service_->set_extensions_enabled(true);
service_->set_show_extensions_prompts(false);
- management_policy_ = static_cast<TestExtensionSystem*>(
+ management_policy_ = static_cast<extensions::TestExtensionSystem*>(
ExtensionSystem::Get(profile))->CreateManagementPolicy();
// When we start up, we want to make sure there is no external provider,
@@ -465,7 +466,7 @@ void ExtensionServiceTestBase::InitializeEmptyExtensionService() {
}
void ExtensionServiceTestBase::InitializeExtensionProcessManager() {
- static_cast<TestExtensionSystem*>(
+ static_cast<extensions::TestExtensionSystem*>(
ExtensionSystem::Get(profile_.get()))->
CreateExtensionProcessManager();
}
@@ -4082,7 +4083,7 @@ TEST(ExtensionServiceTestSimple, Enabledness) {
// By default, we are enabled.
command_line.reset(new CommandLine(CommandLine::NO_PROGRAM));
- ExtensionService* service = static_cast<TestExtensionSystem*>(
+ ExtensionService* service = static_cast<extensions::TestExtensionSystem*>(
ExtensionSystem::Get(profile.get()))->
CreateExtensionService(
command_line.get(),
@@ -4097,7 +4098,7 @@ TEST(ExtensionServiceTestSimple, Enabledness) {
recorder.set_ready(false);
profile.reset(new TestingProfile());
command_line->AppendSwitch(switches::kDisableExtensions);
- service = static_cast<TestExtensionSystem*>(
+ service = static_cast<extensions::TestExtensionSystem*>(
ExtensionSystem::Get(profile.get()))->
CreateExtensionService(
command_line.get(),
@@ -4111,7 +4112,7 @@ TEST(ExtensionServiceTestSimple, Enabledness) {
recorder.set_ready(false);
profile.reset(new TestingProfile());
profile->GetPrefs()->SetBoolean(prefs::kDisableExtensions, true);
- service = static_cast<TestExtensionSystem*>(
+ service = static_cast<extensions::TestExtensionSystem*>(
ExtensionSystem::Get(profile.get()))->
CreateExtensionService(
command_line.get(),
@@ -4126,7 +4127,7 @@ TEST(ExtensionServiceTestSimple, Enabledness) {
profile.reset(new TestingProfile());
profile->GetPrefs()->SetBoolean(prefs::kDisableExtensions, true);
command_line.reset(new CommandLine(CommandLine::NO_PROGRAM));
- service = static_cast<TestExtensionSystem*>(
+ service = static_cast<extensions::TestExtensionSystem*>(
ExtensionSystem::Get(profile.get()))->
CreateExtensionService(
command_line.get(),
« no previous file with comments | « chrome/browser/extensions/extension_service_unittest.h ('k') | chrome/browser/extensions/extension_system.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698