diff options
Diffstat (limited to 'chrome')
47 files changed, 393 insertions, 84 deletions
diff --git a/chrome/browser/chromeos/extensions/file_browser_manifest_unittest.cc b/chrome/browser/chromeos/extensions/file_browser_manifest_unittest.cc index fe40295..2cb936a 100644 --- a/chrome/browser/chromeos/extensions/file_browser_manifest_unittest.cc +++ b/chrome/browser/chromeos/extensions/file_browser_manifest_unittest.cc @@ -27,10 +27,10 @@ class FileBrowserHandlerManifestTest : public ExtensionManifestTest { ExtensionManifestTest::SetUp(); extensions::ManifestHandler::Register( extension_manifest_keys::kFileBrowserHandlers, - new FileBrowserHandlerParser); + make_linked_ptr(new FileBrowserHandlerParser)); extensions::ManifestHandler::Register( - keys::kChromeURLOverrides, - new extensions::URLOverridesHandler); + extension_manifest_keys::kChromeURLOverrides, + make_linked_ptr(new extensions::URLOverridesHandler)); } }; diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api.cc b/chrome/browser/chromeos/extensions/file_browser_private_api.cc index e8f8043..de72ab4 100644 --- a/chrome/browser/chromeos/extensions/file_browser_private_api.cc +++ b/chrome/browser/chromeos/extensions/file_browser_private_api.cc @@ -587,7 +587,7 @@ FileBrowserPrivateAPI::FileBrowserPrivateAPI(Profile* profile) : event_router_(make_scoped_refptr(new FileBrowserEventRouter(profile))) { extensions::ManifestHandler::Register( extension_manifest_keys::kFileBrowserHandlers, - new FileBrowserHandlerParser); + make_linked_ptr(new FileBrowserHandlerParser)); ExtensionFunctionRegistry* registry = ExtensionFunctionRegistry::GetInstance(); diff --git a/chrome/browser/chromeos/extensions/file_browser_resource_throttle_unittest.cc b/chrome/browser/chromeos/extensions/file_browser_resource_throttle_unittest.cc index 8cfe5b7..66cb7f7 100644 --- a/chrome/browser/chromeos/extensions/file_browser_resource_throttle_unittest.cc +++ b/chrome/browser/chromeos/extensions/file_browser_resource_throttle_unittest.cc @@ -69,7 +69,7 @@ class FileBrowserResourceThrottleTest : public testing::Test { virtual void SetUp() { extensions::ManifestHandler::Register( extension_manifest_keys::kFileBrowserHandlers, - new FileBrowserHandlerParser); + make_linked_ptr(new FileBrowserHandlerParser)); // Extension info map must be created before |CreateAndInstallTestExtension| // is called (the method will add created extension to the info map). extension_info_map_ = new ExtensionInfoMap(); diff --git a/chrome/browser/extensions/api/commands/command_service.cc b/chrome/browser/extensions/api/commands/command_service.cc index c917a57..91fae35 100644 --- a/chrome/browser/extensions/api/commands/command_service.cc +++ b/chrome/browser/extensions/api/commands/command_service.cc @@ -47,7 +47,7 @@ void CommandService::RegisterUserPrefs(PrefServiceSyncable* user_prefs) { CommandService::CommandService(Profile* profile) : profile_(profile) { ManifestHandler::Register(extension_manifest_keys::kCommands, - new CommandsHandler); + make_linked_ptr(new CommandsHandler)); ExtensionFunctionRegistry::GetInstance()-> RegisterFunction<GetAllCommandsFunction>(); diff --git a/chrome/browser/extensions/api/extension_action/extension_action_api.cc b/chrome/browser/extensions/api/extension_action/extension_action_api.cc index 398dcb5..fdc2ee1 100644 --- a/chrome/browser/extensions/api/extension_action/extension_action_api.cc +++ b/chrome/browser/extensions/api/extension_action/extension_action_api.cc @@ -188,9 +188,9 @@ static base::LazyInstance<ProfileKeyedAPIFactory<ExtensionActionAPI> > ExtensionActionAPI::ExtensionActionAPI(Profile* profile) { ManifestHandler::Register(extension_manifest_keys::kBrowserAction, - new BrowserActionHandler); + make_linked_ptr(new BrowserActionHandler)); ManifestHandler::Register(extension_manifest_keys::kScriptBadge, - new ScriptBadgeHandler); + make_linked_ptr(new ScriptBadgeHandler)); ExtensionFunctionRegistry* registry = ExtensionFunctionRegistry::GetInstance(); diff --git a/chrome/browser/extensions/api/file_handlers/file_handlers_api.cc b/chrome/browser/extensions/api/file_handlers/file_handlers_api.cc index 3074b40..81c212c 100644 --- a/chrome/browser/extensions/api/file_handlers/file_handlers_api.cc +++ b/chrome/browser/extensions/api/file_handlers/file_handlers_api.cc @@ -12,7 +12,7 @@ namespace extensions { FileHandlersAPI::FileHandlersAPI(Profile* profile) { ManifestHandler::Register(extension_manifest_keys::kFileHandlers, - new FileHandlersParser); + make_linked_ptr(new FileHandlersParser)); } FileHandlersAPI::~FileHandlersAPI() { diff --git a/chrome/browser/extensions/api/i18n/i18n_api.cc b/chrome/browser/extensions/api/i18n/i18n_api.cc index 4351dad..6c97dc4 100644 --- a/chrome/browser/extensions/api/i18n/i18n_api.cc +++ b/chrome/browser/extensions/api/i18n/i18n_api.cc @@ -64,7 +64,7 @@ bool I18nGetAcceptLanguagesFunction::RunImpl() { I18nAPI::I18nAPI(Profile* profile) { ManifestHandler::Register(extension_manifest_keys::kDefaultLocale, - new DefaultLocaleHandler); + make_linked_ptr(new DefaultLocaleHandler)); } I18nAPI::~I18nAPI() { diff --git a/chrome/browser/extensions/api/identity/identity_api.cc b/chrome/browser/extensions/api/identity/identity_api.cc index dd1f898..0766bdc 100644 --- a/chrome/browser/extensions/api/identity/identity_api.cc +++ b/chrome/browser/extensions/api/identity/identity_api.cc @@ -257,7 +257,7 @@ void IdentityLaunchWebAuthFlowFunction::OnAuthFlowFailure() { IdentityAPI::IdentityAPI(Profile* profile) { ManifestHandler::Register(extension_manifest_keys::kOAuth2, - new OAuth2ManifestHandler); + make_linked_ptr(new OAuth2ManifestHandler)); } IdentityAPI::~IdentityAPI() { diff --git a/chrome/browser/extensions/api/identity/identity_apitest.cc b/chrome/browser/extensions/api/identity/identity_apitest.cc index e6f673d..6b9eb24 100644 --- a/chrome/browser/extensions/api/identity/identity_apitest.cc +++ b/chrome/browser/extensions/api/identity/identity_apitest.cc @@ -148,7 +148,7 @@ class GetAuthTokenFunctionTest : public ExtensionBrowserTest { virtual void SetUp() OVERRIDE { ExtensionBrowserTest::SetUp(); ManifestHandler::Register(extension_manifest_keys::kOAuth2, - new OAuth2ManifestHandler); + make_linked_ptr(new OAuth2ManifestHandler)); } protected: enum OAuth2Fields { diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api.cc b/chrome/browser/extensions/api/input_ime/input_ime_api.cc index a9e49e6..b7db669 100644 --- a/chrome/browser/extensions/api/input_ime/input_ime_api.cc +++ b/chrome/browser/extensions/api/input_ime/input_ime_api.cc @@ -841,7 +841,7 @@ bool KeyEventHandled::RunImpl() { InputImeAPI::InputImeAPI(Profile* profile) : profile_(profile) { ManifestHandler::Register(extension_manifest_keys::kInputComponents, - new InputComponentsHandler); + make_linked_ptr(new InputComponentsHandler)); registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED, content::Source<Profile>(profile)); diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chrome/browser/extensions/api/omnibox/omnibox_api.cc index ee00ffc..55a6ee7 100644 --- a/chrome/browser/extensions/api/omnibox/omnibox_api.cc +++ b/chrome/browser/extensions/api/omnibox/omnibox_api.cc @@ -132,7 +132,7 @@ OmniboxAPI::OmniboxAPI(Profile* profile) : profile_(profile), url_service_(TemplateURLServiceFactory::GetForProfile(profile)) { ManifestHandler::Register(extension_manifest_keys::kOmnibox, - new OmniboxHandler); + make_linked_ptr(new OmniboxHandler)); registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED, content::Source<Profile>(profile)); registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED, diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index d86cbcf..9bc21be 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -539,9 +539,10 @@ void ExtensionServiceTestBase::SetUpTestCase() { void ExtensionServiceTestBase::SetUp() { testing::Test::SetUp(); ExtensionErrorReporter::GetInstance()->ClearErrors(); + extensions::ManifestHandler::ClearRegistryForTesting(); extensions::ManifestHandler::Register( keys::kDefaultLocale, - new extensions::DefaultLocaleHandler); + make_linked_ptr(new extensions::DefaultLocaleHandler)); } class ExtensionServiceTest diff --git a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc index b6e7de8..8216a52 100644 --- a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc +++ b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc @@ -28,8 +28,9 @@ class ExtensionSpecialStoragePolicyTest : public testing::Test { virtual void SetUp() { policy_ = new ExtensionSpecialStoragePolicy(NULL); #if defined(ENABLE_WEB_INTENTS) - extensions::ManifestHandler::Register(keys::kIntents, - new extensions::WebIntentsHandler); + extensions::ManifestHandler::Register( + keys::kIntents, + make_linked_ptr(new extensions::WebIntentsHandler)); #endif } diff --git a/chrome/browser/extensions/manifest_url_parser.cc b/chrome/browser/extensions/manifest_url_parser.cc index 313dadd..927db07 100644 --- a/chrome/browser/extensions/manifest_url_parser.cc +++ b/chrome/browser/extensions/manifest_url_parser.cc @@ -19,15 +19,15 @@ namespace extensions { ManifestURLParser::ManifestURLParser(Profile* profile) : profile_(profile) { ManifestHandler::Register(extension_manifest_keys::kDevToolsPage, - new DevToolsPageHandler); + make_linked_ptr(new DevToolsPageHandler)); ManifestHandler::Register(extension_manifest_keys::kHomepageURL, - new HomepageURLHandler); + make_linked_ptr(new HomepageURLHandler)); ManifestHandler::Register(extension_manifest_keys::kUpdateURL, - new UpdateURLHandler); + make_linked_ptr(new UpdateURLHandler)); ManifestHandler::Register(extension_manifest_keys::kOptionsPage, - new OptionsPageHandler); + make_linked_ptr(new OptionsPageHandler)); ManifestHandler::Register(extension_manifest_keys::kChromeURLOverrides, - new URLOverridesHandler); + make_linked_ptr(new URLOverridesHandler)); registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED, content::Source<Profile>(profile)); diff --git a/chrome/browser/extensions/sandboxed_unpacker_unittest.cc b/chrome/browser/extensions/sandboxed_unpacker_unittest.cc index df63f7b..7583fc6 100644 --- a/chrome/browser/extensions/sandboxed_unpacker_unittest.cc +++ b/chrome/browser/extensions/sandboxed_unpacker_unittest.cc @@ -69,7 +69,7 @@ class SandboxedUnpackerTest : public testing::Test { client_->DelegateToFake(); extensions::ManifestHandler::Register( extension_manifest_keys::kDefaultLocale, - new extensions::DefaultLocaleHandler); + make_linked_ptr(new extensions::DefaultLocaleHandler)); } virtual void TearDown() { diff --git a/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chrome/browser/extensions/updater/extension_updater_unittest.cc index 5298645..98b5059 100644 --- a/chrome/browser/extensions/updater/extension_updater_unittest.cc +++ b/chrome/browser/extensions/updater/extension_updater_unittest.cc @@ -458,8 +458,9 @@ class ExtensionUpdaterTest : public testing::Test { virtual void SetUp() OVERRIDE { prefs_.reset(new TestExtensionPrefs(loop_.message_loop_proxy())); - extensions::ManifestHandler::Register(extension_manifest_keys::kUpdateURL, - new extensions::UpdateURLHandler); + extensions::ManifestHandler::Register( + extension_manifest_keys::kUpdateURL, + make_linked_ptr(new extensions::UpdateURLHandler)); } virtual void TearDown() OVERRIDE { diff --git a/chrome/browser/extensions/web_accessible_resources_parser.cc b/chrome/browser/extensions/web_accessible_resources_parser.cc index 61eb6a1..ad5d757 100644 --- a/chrome/browser/extensions/web_accessible_resources_parser.cc +++ b/chrome/browser/extensions/web_accessible_resources_parser.cc @@ -14,7 +14,7 @@ namespace extensions { WebAccessibleResourcesParser::WebAccessibleResourcesParser(Profile* profile) { ManifestHandler::Register(extension_manifest_keys::kWebAccessibleResources, - new WebAccessibleResourcesHandler); + make_linked_ptr(new WebAccessibleResourcesHandler)); } WebAccessibleResourcesParser::~WebAccessibleResourcesParser() { diff --git a/chrome/browser/extensions/web_intents_parser.cc b/chrome/browser/extensions/web_intents_parser.cc index bb63216..26be0a9 100644 --- a/chrome/browser/extensions/web_intents_parser.cc +++ b/chrome/browser/extensions/web_intents_parser.cc @@ -14,7 +14,7 @@ namespace extensions { WebIntentsParser::WebIntentsParser(Profile* profile) { ManifestHandler::Register(extension_manifest_keys::kIntents, - new WebIntentsHandler); + make_linked_ptr(new WebIntentsHandler)); } WebIntentsParser::~WebIntentsParser() { diff --git a/chrome/browser/intents/web_intents_registry_unittest.cc b/chrome/browser/intents/web_intents_registry_unittest.cc index d2738cd..045de49 100644 --- a/chrome/browser/intents/web_intents_registry_unittest.cc +++ b/chrome/browser/intents/web_intents_registry_unittest.cc @@ -103,8 +103,9 @@ class WebIntentsRegistryTest : public testing::Test { EXPECT_CALL(extension_service_, GetExtensionById(testing::_, testing::_)). WillRepeatedly( testing::Invoke(this, &WebIntentsRegistryTest::GetExtensionById)); - extensions::ManifestHandler::Register(extension_manifest_keys::kIntents, - new extensions::WebIntentsHandler); + extensions::ManifestHandler::Register( + extension_manifest_keys::kIntents, + make_linked_ptr(new extensions::WebIntentsHandler)); } virtual void TearDown() { diff --git a/chrome/browser/speech/extension_api/tts_extension_api.cc b/chrome/browser/speech/extension_api/tts_extension_api.cc index 248f5b2..7a9ab7a 100644 --- a/chrome/browser/speech/extension_api/tts_extension_api.cc +++ b/chrome/browser/speech/extension_api/tts_extension_api.cc @@ -187,7 +187,7 @@ TtsAPI* TtsAPI::Get(Profile* profile) { TtsAPI::TtsAPI(Profile* profile) { ManifestHandler::Register(extension_manifest_keys::kTtsEngine, - new TtsEngineManifestHandler); + make_linked_ptr(new TtsEngineManifestHandler)); ExtensionFunctionRegistry* registry = ExtensionFunctionRegistry::GetInstance(); registry->RegisterFunction<ExtensionTtsEngineSendTtsEventFunction>(); diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index 88dd3c8..646c455 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -1536,6 +1536,7 @@ 'common/extensions/manifest_tests/extension_manifests_web_intents_unittest.cc', 'common/extensions/manifest_tests/extension_manifests_web_unittest.cc', 'common/extensions/manifest_unittest.cc', + 'common/extensions/manifest_handler_unittest.cc', 'common/extensions/message_bundle_unittest.cc', 'common/extensions/permissions/api_permission_set_unittest.cc', 'common/extensions/permissions/permission_set_unittest.cc', diff --git a/chrome/common/extensions/api/commands/commands_manifest_unittest.cc b/chrome/common/extensions/api/commands/commands_manifest_unittest.cc index 38c32a0..9a27c39 100644 --- a/chrome/common/extensions/api/commands/commands_manifest_unittest.cc +++ b/chrome/common/extensions/api/commands/commands_manifest_unittest.cc @@ -20,7 +20,7 @@ class CommandsManifestTest : public ExtensionManifestTest { protected: virtual void SetUp() OVERRIDE { ManifestHandler::Register(extension_manifest_keys::kCommands, - new CommandsHandler); + make_linked_ptr(new CommandsHandler)); } }; diff --git a/chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc b/chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc index 01ead27..338a2d9 100644 --- a/chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc +++ b/chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc @@ -23,7 +23,7 @@ class BrowserActionManifestTest : public ExtensionManifestTest { virtual void SetUp() OVERRIDE { ExtensionManifestTest::SetUp(); ManifestHandler::Register(extension_manifest_keys::kBrowserAction, - new BrowserActionHandler); + make_linked_ptr(new BrowserActionHandler)); } }; diff --git a/chrome/common/extensions/api/extension_action/script_badge_manifest_unittest.cc b/chrome/common/extensions/api/extension_action/script_badge_manifest_unittest.cc index bfc4afc..605499c 100644 --- a/chrome/common/extensions/api/extension_action/script_badge_manifest_unittest.cc +++ b/chrome/common/extensions/api/extension_action/script_badge_manifest_unittest.cc @@ -35,7 +35,7 @@ class ScriptBadgeManifestTest : public ExtensionManifestTest { protected: virtual void SetUp() OVERRIDE { ManifestHandler::Register(extension_manifest_keys::kScriptBadge, - new ScriptBadgeHandler); + make_linked_ptr(new ScriptBadgeHandler)); } }; diff --git a/chrome/common/extensions/api/i18n/default_locale_manifest_unittest.cc b/chrome/common/extensions/api/i18n/default_locale_manifest_unittest.cc index 645a3ff..c387d8a 100644 --- a/chrome/common/extensions/api/i18n/default_locale_manifest_unittest.cc +++ b/chrome/common/extensions/api/i18n/default_locale_manifest_unittest.cc @@ -13,14 +13,14 @@ namespace extensions { class DefaultLocaleManifestTest : public ExtensionManifestTest { virtual void SetUp() OVERRIDE { ExtensionManifestTest::SetUp(); - ManifestHandler::Register(keys::kDefaultLocale, - new DefaultLocaleHandler); + ManifestHandler::Register(extension_manifest_keys::kDefaultLocale, + make_linked_ptr(new DefaultLocaleHandler)); } }; TEST_F(DefaultLocaleManifestTest, DefaultLocale) { LoadAndExpectError("default_locale_invalid.json", - errors::kInvalidDefaultLocale); + extension_manifest_errors::kInvalidDefaultLocale); scoped_refptr<Extension> extension( LoadAndExpectSuccess("default_locale_valid.json")); diff --git a/chrome/common/extensions/api/identity/extension_manifests_auth_unittest.cc b/chrome/common/extensions/api/identity/extension_manifests_auth_unittest.cc index d18bb66..d056d70 100644 --- a/chrome/common/extensions/api/identity/extension_manifests_auth_unittest.cc +++ b/chrome/common/extensions/api/identity/extension_manifests_auth_unittest.cc @@ -16,7 +16,7 @@ class OAuth2ManifestTest : public ExtensionManifestTest { protected: virtual void SetUp() OVERRIDE { ManifestHandler::Register(extension_manifest_keys::kOAuth2, - new OAuth2ManifestHandler); + make_linked_ptr(new OAuth2ManifestHandler)); } }; diff --git a/chrome/common/extensions/extension_file_util_unittest.cc b/chrome/common/extensions/extension_file_util_unittest.cc index d6c3931..ffd2eb0 100644 --- a/chrome/common/extensions/extension_file_util_unittest.cc +++ b/chrome/common/extensions/extension_file_util_unittest.cc @@ -33,10 +33,10 @@ class ExtensionFileUtilTest : public testing::Test { testing::Test::SetUp(); extensions::ManifestHandler::Register( extension_manifest_keys::kBrowserAction, - new extensions::BrowserActionHandler); + make_linked_ptr(new extensions::BrowserActionHandler)); extensions::ManifestHandler::Register( keys::kDefaultLocale, - new extensions::DefaultLocaleHandler); + make_linked_ptr(new extensions::DefaultLocaleHandler)); } }; diff --git a/chrome/common/extensions/extension_unittest.cc b/chrome/common/extensions/extension_unittest.cc index e6a891b..9eec106 100644 --- a/chrome/common/extensions/extension_unittest.cc +++ b/chrome/common/extensions/extension_unittest.cc @@ -126,7 +126,7 @@ class ExtensionTest : public testing::Test { protected: virtual void SetUp() OVERRIDE { ManifestHandler::Register(extension_manifest_keys::kCommands, - new CommandsHandler); + make_linked_ptr(new CommandsHandler)); } }; diff --git a/chrome/common/extensions/manifest_handler.cc b/chrome/common/extensions/manifest_handler.cc index c1c7613..389f4f5 100644 --- a/chrome/common/extensions/manifest_handler.cc +++ b/chrome/common/extensions/manifest_handler.cc @@ -7,7 +7,8 @@ #include <map> #include "base/lazy_instance.h" -#include "base/memory/linked_ptr.h" +#include "base/logging.h" +#include "base/stl_util.h" #include "chrome/common/extensions/manifest.h" namespace extensions { @@ -16,48 +17,128 @@ namespace { class ManifestHandlerRegistry { public: + ManifestHandlerRegistry() : is_sorted_(false) { + } + void RegisterManifestHandler(const std::string& key, - ManifestHandler* handler); + linked_ptr<ManifestHandler> handler); bool ParseExtension(Extension* extension, string16* error); + void ClearForTesting(); private: friend struct base::DefaultLazyInstanceTraits<ManifestHandlerRegistry>; typedef std::map<std::string, linked_ptr<ManifestHandler> > ManifestHandlerMap; + typedef std::map<ManifestHandler*, int> ManifestHandlerPriorityMap; + + // Puts the manifest handlers in order such that each handler comes after + // any handlers for their PrerequisiteKeys. If there is no handler for + // a prerequisite key, that dependency is simply ignored. + // CHECKs that there are no manifest handlers with circular dependencies. + void SortManifestHandlers(); + // All registered manifest handlers. ManifestHandlerMap handlers_; + + // The priority for each manifest handler. Handlers with lower priority + // values are evaluated first. + ManifestHandlerPriorityMap priority_map_; + bool is_sorted_; }; void ManifestHandlerRegistry::RegisterManifestHandler( - const std::string& key, ManifestHandler* handler) { - handlers_[key] = make_linked_ptr(handler); + const std::string& key, linked_ptr<ManifestHandler> handler) { + handlers_[key] = handler; + is_sorted_ = false; } bool ManifestHandlerRegistry::ParseExtension(Extension* extension, string16* error) { - std::set<ManifestHandler*> handler_set; + SortManifestHandlers(); + std::map<int, ManifestHandler*> handlers_by_priority; for (ManifestHandlerMap::iterator iter = handlers_.begin(); iter != handlers_.end(); ++iter) { ManifestHandler* handler = iter->second.get(); if (extension->manifest()->HasPath(iter->first) || - handler->AlwaysParseForType(extension->GetType())) - handler_set.insert(handler); + handler->AlwaysParseForType(extension->GetType())) { + handlers_by_priority[priority_map_[handler]] = handler; + } } - - // TODO(yoz): Some handlers may depend on other handlers having already - // parsed their keys. Reorder the handlers so that handlers needed earlier - // come first in the returned container. - for (std::set<ManifestHandler*>::iterator iter = handler_set.begin(); - iter != handler_set.end(); ++iter) { - if (!(*iter)->Parse(extension, error)) + for (std::map<int, ManifestHandler*>::iterator iter = + handlers_by_priority.begin(); + iter != handlers_by_priority.end(); ++iter) { + if (!(iter->second)->Parse(extension, error)) return false; } return true; } +void ManifestHandlerRegistry::ClearForTesting() { + priority_map_.clear(); + handlers_.clear(); + is_sorted_ = false; +} + +void ManifestHandlerRegistry::SortManifestHandlers() { + if (is_sorted_) + return; + + // Forget our existing sort order. + priority_map_.clear(); + std::set<ManifestHandler*> unsorted_handlers; + for (ManifestHandlerMap::const_iterator iter = handlers_.begin(); + iter != handlers_.end(); ++iter) { + unsorted_handlers.insert(iter->second.get()); + } + + int priority = 0; + while (true) { + std::set<ManifestHandler*> next_unsorted_handlers; + for (std::set<ManifestHandler*>::const_iterator iter = + unsorted_handlers.begin(); + iter != unsorted_handlers.end(); ++iter) { + ManifestHandler* handler = *iter; + const std::vector<std::string>& prerequisites = + handler->PrerequisiteKeys(); + int unsatisfied = prerequisites.size(); + for (size_t i = 0; i < prerequisites.size(); ++i) { + ManifestHandlerMap::const_iterator prereq_iter = + handlers_.find(prerequisites[i]); + // If the prerequisite does not exist, crash. + CHECK(prereq_iter != handlers_.end()) + << "Extension manifest handler depends on unrecognized key " + << prerequisites[i]; + // Prerequisite is in our map. + if (ContainsKey(priority_map_, prereq_iter->second.get())) + unsatisfied--; + } + if (unsatisfied == 0) { + priority_map_[handler] = priority; + priority++; + } else { + // Put in the list for next time. + next_unsorted_handlers.insert(handler); + } + } + if (next_unsorted_handlers.size() == unsorted_handlers.size()) + break; + unsorted_handlers.swap(next_unsorted_handlers); + } + + // If there are any leftover unsorted handlers, they must have had + // circular dependencies. + CHECK(unsorted_handlers.size() == 0) << "Extension manifest handlers have " + << "circular dependencies!"; + + is_sorted_ = true; +} + static base::LazyInstance<ManifestHandlerRegistry> g_registry = LAZY_INSTANCE_INITIALIZER; +static base::LazyInstance<std::vector<std::string> > g_empty_string_vector = + LAZY_INSTANCE_INITIALIZER; + } // namespace ManifestHandler::ManifestHandler() { @@ -70,9 +151,13 @@ bool ManifestHandler::AlwaysParseForType(Manifest::Type type) { return false; } +const std::vector<std::string>& ManifestHandler::PrerequisiteKeys() { + return g_empty_string_vector.Get(); +} + // static void ManifestHandler::Register(const std::string& key, - ManifestHandler* handler) { + linked_ptr<ManifestHandler> handler) { g_registry.Get().RegisterManifestHandler(key, handler); } @@ -81,4 +166,9 @@ bool ManifestHandler::ParseExtension(Extension* extension, string16* error) { return g_registry.Get().ParseExtension(extension, error); } +// static +void ManifestHandler::ClearRegistryForTesting() { + g_registry.Get().ClearForTesting(); +} + } // namespace extensions diff --git a/chrome/common/extensions/manifest_handler.h b/chrome/common/extensions/manifest_handler.h index 22c1a17..63380c7 100644 --- a/chrome/common/extensions/manifest_handler.h +++ b/chrome/common/extensions/manifest_handler.h @@ -8,6 +8,7 @@ #include <set> #include <string> +#include "base/memory/linked_ptr.h" #include "base/string16.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest.h" @@ -32,17 +33,27 @@ class ManifestHandler { // TODO(yoz): Use Feature availability instead. virtual bool AlwaysParseForType(Manifest::Type type); + // The list of keys that, if present, should be parsed before calling our + // Parse (typically, because our Parse needs to read those keys). + // Defaults to empty. + virtual const std::vector<std::string>& PrerequisiteKeys(); + // Associate |handler| with |key| in the manifest. A handler can register // for multiple keys. The global registry takes ownership of |handler|; // if it has an existing handler for |key|, it replaces it with this one. // // WARNING: Manifest handlers registered only in the browser process // are not available to renderers or utility processes. - static void Register(const std::string& key, ManifestHandler* handler); + static void Register(const std::string& key, + linked_ptr<ManifestHandler> handler); // Call Parse on all registered manifest handlers that should parse // this extension. static bool ParseExtension(Extension* extension, string16* error); + + // Reset the manifest handler registry to an empty state. Useful for + // unit tests. + static void ClearRegistryForTesting(); }; } // namespace extensions diff --git a/chrome/common/extensions/manifest_handler_unittest.cc b/chrome/common/extensions/manifest_handler_unittest.cc new file mode 100644 index 0000000..83116c2 --- /dev/null +++ b/chrome/common/extensions/manifest_handler_unittest.cc @@ -0,0 +1,190 @@ +// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include <string> +#include <vector> + +#include "base/file_path.h" +#include "base/stl_util.h" +#include "base/utf_string_conversions.h" +#include "chrome/common/extensions/extension.h" +#include "chrome/common/extensions/extension_builder.h" +#include "chrome/common/extensions/manifest_handler.h" +#include "chrome/common/extensions/value_builder.h" +#include "testing/gtest/include/gtest/gtest.h" + +namespace extensions { + +class ManifestHandlerTest : public testing::Test { + public: + class ParsingWatcher { + public: + // Called when a manifest handler parses. + void Record(const std::string& name) { + parsed_names_.push_back(name); + } + + const std::vector<std::string>& parsed_names() { + return parsed_names_; + } + + // Returns true if |name_before| was parsed before |name_after|. + bool ParsedBefore(const std::string& name_before, + const std::string& name_after) { + size_t i_before = parsed_names_.size(); + size_t i_after = 0; + for (size_t i = 0; i < parsed_names_.size(); ++i) { + if (parsed_names_[i] == name_before) + i_before = i; + if (parsed_names_[i] == name_after) + i_after = i; + } + if (i_before < i_after) + return true; + return false; + } + + private: + // The order of manifest handlers that we watched parsing. + std::vector<std::string> parsed_names_; + }; + + class TestManifestHandler : public ManifestHandler { + public: + TestManifestHandler(const std::string& name, + const std::vector<std::string>& prereqs, + ParsingWatcher* watcher) + : name_(name), prereqs_(prereqs), watcher_(watcher) { + } + + virtual bool Parse(Extension* extension, string16* error) OVERRIDE { + watcher_->Record(name_); + return true; + } + + virtual const std::vector<std::string>& PrerequisiteKeys() OVERRIDE { + return prereqs_; + } + + protected: + std::string name_; + std::vector<std::string> prereqs_; + ParsingWatcher* watcher_; + }; + + class FailingTestManifestHandler : public TestManifestHandler { + public: + FailingTestManifestHandler(const std::string& name, + const std::vector<std::string> prereqs, + ParsingWatcher* watcher) + : TestManifestHandler(name, prereqs, watcher) { + } + virtual bool Parse(Extension* extension, string16* error) OVERRIDE { + *error = ASCIIToUTF16(name_); + return false; + } + }; + + class AlwaysParseTestManifestHandler : public TestManifestHandler { + public: + AlwaysParseTestManifestHandler(const std::string& name, + const std::vector<std::string> prereqs, + ParsingWatcher* watcher) + : TestManifestHandler(name, prereqs, watcher) { + } + + virtual bool AlwaysParseForType(Manifest::Type type) OVERRIDE { + return true; + } + }; + + protected: + virtual void SetUp() OVERRIDE { + ManifestHandler::ClearRegistryForTesting(); + } +}; + +TEST_F(ManifestHandlerTest, DependentHandlers) { + ParsingWatcher watcher; + std::vector<std::string> prereqs; + ManifestHandler::Register( + "a", make_linked_ptr(new TestManifestHandler("A", prereqs, &watcher))); + ManifestHandler::Register( + "b", make_linked_ptr(new TestManifestHandler("B", prereqs, &watcher))); + ManifestHandler::Register( + "j", make_linked_ptr(new TestManifestHandler("J", prereqs, &watcher))); + ManifestHandler::Register( + "k", make_linked_ptr( + new AlwaysParseTestManifestHandler("K", prereqs, &watcher))); + prereqs.push_back("c.d"); + linked_ptr<TestManifestHandler> handler_c2( + new TestManifestHandler("C.EZ", prereqs, &watcher)); + ManifestHandler::Register("c.e", handler_c2); + ManifestHandler::Register("c.z", handler_c2); + prereqs.clear(); + prereqs.push_back("b"); + prereqs.push_back("k"); + ManifestHandler::Register( + "c.d", make_linked_ptr(new TestManifestHandler( + "C.D", prereqs, &watcher))); + + scoped_refptr<Extension> extension = ExtensionBuilder() + .SetManifest(DictionaryBuilder() + .Set("name", "no name") + .Set("version", "0") + .Set("manifest_version", 2) + .Set("a", 1) + .Set("b", 2) + .Set("c", DictionaryBuilder() + .Set("d", 3) + .Set("e", 4) + .Set("f", 5)) + .Set("g", 6)) + .Build(); + + // A, B, C.EZ, C.D, K + EXPECT_EQ(5u, watcher.parsed_names().size()); + EXPECT_TRUE(watcher.ParsedBefore("B", "C.D")); + EXPECT_TRUE(watcher.ParsedBefore("K", "C.D")); + EXPECT_TRUE(watcher.ParsedBefore("C.D", "C.EZ")); +} + +TEST_F(ManifestHandlerTest, FailingHandlers) { + // Can't use ExtensionBuilder, because this extension will fail to + // be parsed. + scoped_ptr<base::DictionaryValue> manifest_a( + DictionaryBuilder() + .Set("name", "no name") + .Set("version", "0") + .Set("manifest_version", 2) + .Set("a", 1) + .Build()); + + // Succeeds when "a" is not recognized. + std::string error; + scoped_refptr<Extension> extension = Extension::Create( + FilePath(), + Manifest::INVALID_LOCATION, + *manifest_a, + Extension::NO_FLAGS, + &error); + EXPECT_TRUE(extension); + + // Register a handler for "a" that fails. + ParsingWatcher watcher; + ManifestHandler::Register( + "a", make_linked_ptr(new FailingTestManifestHandler( + "A", std::vector<std::string>(), &watcher))); + + extension = Extension::Create( + FilePath(), + Manifest::INVALID_LOCATION, + *manifest_a, + Extension::NO_FLAGS, + &error); + EXPECT_FALSE(extension); + EXPECT_EQ("A", error); +} + +} // namespace extensions diff --git a/chrome/common/extensions/manifest_tests/extension_manifest_test.cc b/chrome/common/extensions/manifest_tests/extension_manifest_test.cc index 80f3392..2e12386 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifest_test.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifest_test.cc @@ -11,6 +11,7 @@ #include "base/path_service.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension_l10n_util.h" +#include "chrome/common/extensions/manifest_handler.h" #include "ui/base/l10n/l10n_util.h" using extensions::Extension; @@ -20,6 +21,10 @@ ExtensionManifestTest::ExtensionManifestTest() // UNKNOWN == trunk. current_channel_(chrome::VersionInfo::CHANNEL_UNKNOWN) {} +void ExtensionManifestTest::SetUp() { + extensions::ManifestHandler::ClearRegistryForTesting(); +} + // static DictionaryValue* ExtensionManifestTest::LoadManifestFile( const std::string& filename, diff --git a/chrome/common/extensions/manifest_tests/extension_manifest_test.h b/chrome/common/extensions/manifest_tests/extension_manifest_test.h index b1c330d..d803408 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifest_test.h +++ b/chrome/common/extensions/manifest_tests/extension_manifest_test.h @@ -13,14 +13,13 @@ #include "chrome/common/extensions/manifest.h" #include "testing/gtest/include/gtest/gtest.h" -namespace errors = extension_manifest_errors; -namespace keys = extension_manifest_keys; - class ExtensionManifestTest : public testing::Test { public: ExtensionManifestTest(); protected: + virtual void SetUp() OVERRIDE; + // If filename is a relative path, LoadManifestFile will treat it relative to // the appropriate test directory. static DictionaryValue* LoadManifestFile(const std::string& filename, diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc index 07551ec..d929169 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc @@ -16,6 +16,7 @@ #include "testing/gtest/include/gtest/gtest.h" namespace errors = extension_manifest_errors; +namespace keys = extension_manifest_keys; namespace extensions { diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_devtools_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_devtools_unittest.cc index afcde45..d6ebc78 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_devtools_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_devtools_unittest.cc @@ -14,7 +14,7 @@ class DevToolsPageManifestTest : public ExtensionManifestTest { ExtensionManifestTest::SetUp(); extensions::ManifestHandler::Register( extension_manifest_keys::kDevToolsPage, - new extensions::DevToolsPageHandler); + make_linked_ptr(new extensions::DevToolsPageHandler)); } }; diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_homepage_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_homepage_unittest.cc index 71b2f31..e3b7bad 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_homepage_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_homepage_unittest.cc @@ -15,10 +15,12 @@ namespace errors = extension_manifest_errors; class HomepageURLManifestTest : public ExtensionManifestTest { virtual void SetUp() OVERRIDE { ExtensionManifestTest::SetUp(); - extensions::ManifestHandler::Register(extension_manifest_keys::kHomepageURL, - new extensions::HomepageURLHandler); - extensions::ManifestHandler::Register(extension_manifest_keys::kUpdateURL, - new extensions::UpdateURLHandler); + extensions::ManifestHandler::Register( + extension_manifest_keys::kHomepageURL, + make_linked_ptr(new extensions::HomepageURLHandler)); + extensions::ManifestHandler::Register( + extension_manifest_keys::kUpdateURL, + make_linked_ptr(new extensions::UpdateURLHandler)); } }; diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc index aa7f5c5f..ed658be 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc @@ -25,10 +25,10 @@ class InitValueManifestTest : public ExtensionManifestTest { ExtensionManifestTest::SetUp(); extensions::ManifestHandler::Register( extension_manifest_keys::kOptionsPage, - new extensions::OptionsPageHandler); + make_linked_ptr(new extensions::OptionsPageHandler)); extensions::ManifestHandler::Register( extension_manifest_keys::kDefaultLocale, - new extensions::DefaultLocaleHandler); + make_linked_ptr(new extensions::DefaultLocaleHandler)); } }; diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_launch_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_launch_unittest.cc index 9797b0c..4cf2475 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_launch_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_launch_unittest.cc @@ -12,6 +12,7 @@ #include "testing/gtest/include/gtest/gtest.h" namespace errors = extension_manifest_errors; +namespace keys = extension_manifest_keys; using extensions::ErrorUtils; diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_options_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_options_unittest.cc index 562c61c..f90d361 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_options_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_options_unittest.cc @@ -13,8 +13,9 @@ namespace errors = extension_manifest_errors; class OptionsPageManifestTest : public ExtensionManifestTest { virtual void SetUp() OVERRIDE { ExtensionManifestTest::SetUp(); - extensions::ManifestHandler::Register(extension_manifest_keys::kOptionsPage, - new extensions::OptionsPageHandler); + extensions::ManifestHandler::Register( + extension_manifest_keys::kOptionsPage, + make_linked_ptr(new extensions::OptionsPageHandler)); } }; diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_override_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_override_unittest.cc index 9e4489d..ac235c2 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_override_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_override_unittest.cc @@ -13,8 +13,9 @@ namespace errors = extension_manifest_errors; class URLOverridesManifestTest : public ExtensionManifestTest { virtual void SetUp() OVERRIDE { ExtensionManifestTest::SetUp(); - extensions::ManifestHandler::Register(keys::kChromeURLOverrides, - new extensions::URLOverridesHandler); + extensions::ManifestHandler::Register( + extension_manifest_keys::kChromeURLOverrides, + make_linked_ptr(new extensions::URLOverridesHandler)); } }; diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_ui_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_ui_unittest.cc index 800b0e8..f579b56 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_ui_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_ui_unittest.cc @@ -15,7 +15,7 @@ class UIManifestTest : public ExtensionManifestTest { protected: virtual void SetUp() OVERRIDE { ManifestHandler::Register(extension_manifest_keys::kBrowserAction, - new BrowserActionHandler); + make_linked_ptr(new BrowserActionHandler)); } }; diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_update_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_update_unittest.cc index f51a4c3..b2e5440 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_update_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_update_unittest.cc @@ -15,8 +15,9 @@ namespace errors = extension_manifest_errors; class UpdateURLManifestTest : public ExtensionManifestTest { virtual void SetUp() OVERRIDE { ExtensionManifestTest::SetUp(); - extensions::ManifestHandler::Register(extension_manifest_keys::kUpdateURL, - new extensions::UpdateURLHandler); + extensions::ManifestHandler::Register( + extension_manifest_keys::kUpdateURL, + make_linked_ptr(new extensions::UpdateURLHandler)); } }; diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_web_accessible_resources_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_web_accessible_resources_unittest.cc index 438c9e5..bcdb9c9 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_web_accessible_resources_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_web_accessible_resources_unittest.cc @@ -16,7 +16,7 @@ class WebAccessibleResourcesManifestTest : public ExtensionManifestTest { ExtensionManifestTest::SetUp(); extensions::ManifestHandler::Register( extension_manifest_keys::kWebAccessibleResources, - new extensions::WebAccessibleResourcesHandler); + make_linked_ptr(new extensions::WebAccessibleResourcesHandler)); } }; diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_web_intents_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_web_intents_unittest.cc index 60406f0..0c508d9 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_web_intents_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_web_intents_unittest.cc @@ -18,8 +18,9 @@ namespace errors = extension_manifest_errors; class WebIntentsManifestTest : public ExtensionManifestTest { virtual void SetUp() OVERRIDE { ExtensionManifestTest::SetUp(); - extensions::ManifestHandler::Register(extension_manifest_keys::kIntents, - new extensions::WebIntentsHandler); + extensions::ManifestHandler::Register( + extension_manifest_keys::kIntents, + make_linked_ptr(new extensions::WebIntentsHandler)); } }; diff --git a/chrome/common/extensions/unpacker_unittest.cc b/chrome/common/extensions/unpacker_unittest.cc index a89881f..b6efe10 100644 --- a/chrome/common/extensions/unpacker_unittest.cc +++ b/chrome/common/extensions/unpacker_unittest.cc @@ -34,8 +34,9 @@ public: virtual void SetUp() OVERRIDE { testing::Test::SetUp(); - extensions::ManifestHandler::Register(keys::kDefaultLocale, - new extensions::DefaultLocaleHandler); + extensions::ManifestHandler::Register( + keys::kDefaultLocale, + make_linked_ptr(new extensions::DefaultLocaleHandler)); } void SetupUnpacker(const std::string& crx_name) { diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index fc32fdb..f323a27 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -128,10 +128,10 @@ namespace { void RegisterExtensionManifestHandlers() { extensions::ManifestHandler::Register( extension_manifest_keys::kDevToolsPage, - new extensions::DevToolsPageHandler); + make_linked_ptr(new extensions::DevToolsPageHandler)); extensions::ManifestHandler::Register( extension_manifest_keys::kWebAccessibleResources, - new extensions::WebAccessibleResourcesHandler); + make_linked_ptr(new extensions::WebAccessibleResourcesHandler)); } static void AppendParams(const std::vector<string16>& additional_names, @@ -330,8 +330,8 @@ void ChromeContentRendererClient::RenderViewCreated( } #endif -#if defined(ENABLE_ONE_CLICK_SIGNIN)
- new OneClickSigninAgent(render_view);
+#if defined(ENABLE_ONE_CLICK_SIGNIN) + new OneClickSigninAgent(render_view); #endif } diff --git a/chrome/utility/chrome_content_utility_client.cc b/chrome/utility/chrome_content_utility_client.cc index 411b882..a36a0a20 100644 --- a/chrome/utility/chrome_content_utility_client.cc +++ b/chrome/utility/chrome_content_utility_client.cc @@ -53,10 +53,10 @@ namespace { void RegisterExtensionManifestHandlers() { extensions::ManifestHandler::Register( extension_manifest_keys::kBrowserAction, - new extensions::BrowserActionHandler); + make_linked_ptr(new extensions::BrowserActionHandler)); extensions::ManifestHandler::Register( extension_manifest_keys::kDefaultLocale, - new extensions::DefaultLocaleHandler); + make_linked_ptr(new extensions::DefaultLocaleHandler)); } } // namespace |