Merge 32345 - Parse messages.json in ExtensionUnpacker (like we do for manife...

chrome/utility/utility_thread.cc

 // Copyright (c) 2009 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/utility/utility_thread.h"
 
 #include "base/file_util.h"
 #include "base/values.h"
 #include "chrome/common/child_process.h"
 #include "chrome/common/extensions/extension_unpacker.h"
@@ skipping 13 matching lines @@
     IPC_MESSAGE_HANDLER(UtilityMsg_UnpackExtension, OnUnpackExtension)
     IPC_MESSAGE_HANDLER(UtilityMsg_UnpackWebResource, OnUnpackWebResource)
     IPC_MESSAGE_HANDLER(UtilityMsg_ParseUpdateManifest, OnParseUpdateManifest)
   IPC_END_MESSAGE_MAP()
 }
 
 void UtilityThread::OnUnpackExtension(const FilePath& extension_path) {
   ExtensionUnpacker unpacker(extension_path);
   if (unpacker.Run() && unpacker.DumpImagesToFile()) {
     Send(new UtilityHostMsg_UnpackExtension_Succeeded(
-         *unpacker.parsed_manifest()));
+      *unpacker.parsed_manifest(), *unpacker.parsed_catalogs()));
   } else {
     Send(new UtilityHostMsg_UnpackExtension_Failed(unpacker.error_message()));
   }
 
   ChildProcess::current()->ReleaseProcess();
 }
 
 void UtilityThread::OnUnpackWebResource(const std::string& resource_data) {
   // Parse json data.
   // TODO(mrc): Add the possibility of a template that controls parsing, and
@@ skipping 12 matching lines @@
 
 void UtilityThread::OnParseUpdateManifest(const std::string& xml) {
   UpdateManifest manifest;
   if (!manifest.Parse(xml)) {
     Send(new UtilityHostMsg_ParseUpdateManifest_Failed(manifest.errors()));
   } else {
     Send(new UtilityHostMsg_ParseUpdateManifest_Succeeded(manifest.results()));
   }
   ChildProcess::current()->ReleaseProcess();
 }