Change manifest handler interface to always (implicitly) pass the entire manifest to handlers.

chrome/common/extensions/web_intents_handler.cc

 // Copyright (c) 2012 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 "chrome/common/extensions/web_intents_handler.h"
 
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
+#include "chrome/common/extensions/manifest.h"
 #include "extensions/common/error_utils.h"
 #include "webkit/glue/web_intent_service_data.h"
 
 namespace extensions {
 
 namespace keys = extension_manifest_keys;
 namespace values = extension_manifest_values;
 namespace errors = extension_manifest_errors;
 
 namespace {
@@ skipping 137 matching lines @@
       extension->GetManifestData(keys::kIntents));
   return info ? info->intents_services_ : g_empty_intents_data.Get();
 }
 
 WebIntentsHandler::WebIntentsHandler() {
 }
 
 WebIntentsHandler::~WebIntentsHandler() {
 }
 
-bool WebIntentsHandler::Parse(const base::Value* value,
-                              Extension* extension,
-                              string16* error) {
+bool WebIntentsHandler::Parse(Extension* extension, string16* error) {
   scoped_ptr<WebIntentsInfo> info(new WebIntentsInfo);
   const DictionaryValue* all_services = NULL;
-  if (!value->GetAsDictionary(&all_services)) {
+  if (!extension->manifest()->GetDictionary(keys::kIntents, &all_services)) {
     *error = ASCIIToUTF16(errors::kInvalidIntents);
     return false;
   }
 
   for (DictionaryValue::key_iterator iter(all_services->begin_keys());
        iter != all_services->end_keys(); ++iter) {
     // Any entry in the intents dictionary can either have a list of
     // dictionaries, or just a single dictionary attached to that. Try
     // lists first, fall back to single dictionary.
     const ListValue* service_list = NULL;
@@ skipping 17 matching lines @@
       if (!LoadWebIntentsAction(*iter, *one_service, extension,
                                 error, &info->intents_services_))
         return false;
     }
   }
   extension->SetManifestData(keys::kIntents, info.release());
   return true;
 }
 
 }  // namespace extensions