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

chrome/common/extensions/api/file_handlers/file_handlers_parser.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/api/file_handlers/file_handlers_parser.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"
 
 namespace extensions {
 
 FileHandlerInfo::FileHandlerInfo() {}
 FileHandlerInfo::~FileHandlerInfo() {}
 
 FileHandlers::FileHandlers() {}
 FileHandlers::~FileHandlers() {}
 
@@ skipping 45 matching lines @@
           std::string(base::IntToString(i)));
       return false;
     }
     handler.types.insert(type);
   }
 
   file_handlers->push_back(handler);
   return true;
 }
 
-bool FileHandlersParser::Parse(const base::Value* value,
-                               Extension* extension,
-                               string16* error) {
+bool FileHandlersParser::Parse(Extension* extension, string16* error) {
   scoped_ptr<FileHandlers> info(new FileHandlers);
   const DictionaryValue* all_handlers = NULL;
-  if (!value->GetAsDictionary(&all_handlers)) {
+  if (!extension->manifest()->GetDictionary(
+          extension_manifest_keys::kFileHandlers, &all_handlers)) {
     *error = ASCIIToUTF16(extension_manifest_errors::kInvalidFileHandlers);
     return false;
   }
 
   DCHECK(extension->is_platform_app());
 
   for (DictionaryValue::key_iterator iter(all_handlers->begin_keys());
        iter != all_handlers->end_keys(); ++iter) {
     // A file handler entry is a title and a list of MIME types to handle.
     const DictionaryValue* handler = NULL;
     if (all_handlers->GetDictionaryWithoutPathExpansion(*iter, &handler)) {
       if (!LoadFileHandler(*iter, *handler, &info->file_handlers, error))
         return false;
     } else {
       *error = ASCIIToUTF16(extension_manifest_errors::kInvalidFileHandlers);
       return false;
     }
   }
 
   extension->SetManifestData(extension_manifest_keys::kFileHandlers,
                              info.release());
   return true;
 }
 
 }  // namespace extensions