diff options
| author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-05 00:26:24 +0000 |
|---|---|---|
| committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-05 00:26:24 +0000 |
| commit | 03e075367e4dc574ef190da93e8b80914d8a589d (patch) | |
| tree | 7f878af783192123ff53529871578df27018e944 /chrome/browser/intents | |
| parent | a46d5376c4021468352355ab83273598bc04995d (diff) | |
| download | chromium_src-03e075367e4dc574ef190da93e8b80914d8a589d.zip chromium_src-03e075367e4dc574ef190da93e8b80914d8a589d.tar.gz chromium_src-03e075367e4dc574ef190da93e8b80914d8a589d.tar.bz2 | |
Allow manifest handlers to declare keys they depend on that must be parsed before them.
Also fixes linked_ptr usage for multi-key handlers.
BUG=159265
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12091115
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180575 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/intents')
| -rw-r--r-- | chrome/browser/intents/web_intents_registry_unittest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
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() { |