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

Unified Diff: chrome/browser/extensions/test_extension_system.h

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/test_extension_system.h
diff --git a/chrome/browser/extensions/test_extension_system.h b/chrome/browser/extensions/test_extension_system.h
index 9c38a182251af10db8d453b5ae592fed783a7183..3cea94ebb5254e37a65dd068a01070198bd322b9 100644
--- a/chrome/browser/extensions/test_extension_system.h
+++ b/chrome/browser/extensions/test_extension_system.h
@@ -14,6 +14,8 @@ namespace base {
class Time;
}
+namespace extensions {
+
// Test ExtensionSystem, for use with TestingProfile.
class TestExtensionSystem : public ExtensionSystem {
public:
@@ -31,7 +33,7 @@ class TestExtensionSystem : public ExtensionSystem {
// Creates and returns a ManagementPolicy with the ExtensionService and
// ExtensionPrefs registered. If not invoked, the ManagementPolicy is NULL.
- extensions::ManagementPolicy* CreateManagementPolicy();
+ ManagementPolicy* CreateManagementPolicy();
// Creates an ExtensionProcessManager. If not invoked, the
// ExtensionProcessManager is NULL.
@@ -42,19 +44,19 @@ class TestExtensionSystem : public ExtensionSystem {
virtual void Init(bool extensions_enabled) OVERRIDE {}
virtual ExtensionService* extension_service() OVERRIDE;
- virtual extensions::ManagementPolicy* management_policy() OVERRIDE;
+ virtual ManagementPolicy* management_policy() OVERRIDE;
void SetExtensionService(ExtensionService* service);
virtual UserScriptMaster* user_script_master() OVERRIDE;
virtual ExtensionDevToolsManager* devtools_manager() OVERRIDE;
virtual ExtensionProcessManager* process_manager() OVERRIDE;
- virtual extensions::AlarmManager* alarm_manager() OVERRIDE;
- virtual extensions::StateStore* state_store() OVERRIDE;
+ virtual AlarmManager* alarm_manager() OVERRIDE;
+ virtual StateStore* state_store() OVERRIDE;
virtual ExtensionInfoMap* info_map() OVERRIDE;
- virtual extensions::LazyBackgroundTaskQueue*
+ virtual LazyBackgroundTaskQueue*
lazy_background_task_queue() OVERRIDE;
virtual ExtensionMessageService* message_service() OVERRIDE;
virtual ExtensionEventRouter* event_router() OVERRIDE;
- virtual extensions::RulesRegistryService* rules_registry_service()
+ virtual RulesRegistryService* rules_registry_service()
OVERRIDE;
// Factory method for tests to use with SetTestingProfile.
@@ -65,13 +67,15 @@ class TestExtensionSystem : public ExtensionSystem {
// The Extension Preferences. Only created if CreateExtensionService is
// invoked.
- scoped_ptr<extensions::ExtensionPrefs> extension_prefs_;
- scoped_ptr<extensions::StateStore> state_store_;
+ scoped_ptr<ExtensionPrefs> extension_prefs_;
+ scoped_ptr<StateStore> state_store_;
scoped_ptr<ExtensionService> extension_service_;
- scoped_ptr<extensions::ManagementPolicy> management_policy_;
+ scoped_ptr<ManagementPolicy> management_policy_;
scoped_ptr<ExtensionProcessManager> extension_process_manager_;
- scoped_ptr<extensions::AlarmManager> alarm_manager_;
+ scoped_ptr<AlarmManager> alarm_manager_;
scoped_refptr<ExtensionInfoMap> info_map_;
};
+} // namespace extensions
+
#endif // CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_SYSTEM_H_
« no previous file with comments | « chrome/browser/extensions/script_badge_controller.cc ('k') | chrome/browser/extensions/test_extension_system.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698