Move sandboxed_unpacker.{h,cc} from chrome/ to extensions/

chrome/utility/extensions/extensions_handler.cc

 // Copyright 2014 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/extensions/extensions_handler.h"
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "chrome/common/chrome_utility_messages.h"
 #include "chrome/common/extensions/chrome_extensions_client.h"
 #include "chrome/common/extensions/chrome_utility_extensions_messages.h"
 #include "chrome/common/media_galleries/metadata_types.h"
 #include "chrome/utility/chrome_content_utility_client.h"
 #include "chrome/utility/media_galleries/image_metadata_extractor.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/utility/utility_thread.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_l10n_util.h"
 #include "extensions/common/extension_utility_messages.h"
-#include "extensions/common/manifest.h"
 #include "extensions/utility/unpacker.h"
 #include "media/base/media.h"
 #include "media/base/media_file_checker.h"
 #include "third_party/zlib/google/zip.h"
 #include "ui/base/ui_base_switches.h"
 
 #if defined(OS_WIN)
 #include "chrome/common/extensions/api/networking_private/networking_private_crypto.h"
 #include "chrome/utility/media_galleries/itunes_pref_parser_win.h"
 #include "components/wifi/wifi_service.h"
@@ skipping 21 matching lines @@
 void ReleaseProcessIfNeeded() {
   content::UtilityThread::Get()->ReleaseProcessIfNeeded();
 }
 
 const char kExtensionHandlerUnzipError[] =
     "Could not unzip extension for install.";
 
 }  // namespace
 
 ExtensionsHandler::ExtensionsHandler() {
+  ExtensionsClient::Set(ChromeExtensionsClient::GetInstance());

[asargent_no_longer_on_chrome, 2015/01/21 21:41:55]

Note that we used to only do this inside OnUnpackExtension which got moved out
to extensions::UtilityHandler.

I guess we didn't happen to need an ExtensionsClient for the work that happens
in any of the other message handlers here, but it should not hurt to have one
registered either. 

 }
 
 ExtensionsHandler::~ExtensionsHandler() {
 }
 
 // static
 void ExtensionsHandler::PreSandboxStartup() {
   // Initialize libexif for image metadata parsing.
   metadata::ImageMetadataExtractor::InitializeLibrary();
 
   // Load media libraries for media file validation.
   base::FilePath media_path;
   PathService::Get(content::DIR_MEDIA_LIBS, &media_path);
   if (!media_path.empty())
     media::InitializeMediaLibrary(media_path);
 }
 
-// static
-void ExtensionsHandler::UtilityThreadStarted() {
-  UtilityHandler::UtilityThreadStarted();
-}
-
 bool ExtensionsHandler::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ExtensionsHandler, message)
-    IPC_MESSAGE_HANDLER(ChromeUtilityMsg_UnpackExtension, OnUnpackExtension)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_UnzipToDir, OnUnzipToDir)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_DecodeImageBase64, OnDecodeImageBase64)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_CheckMediaFile, OnCheckMediaFile)
 #if defined(OS_WIN)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_ParseITunesPrefXml,
                         OnParseITunesPrefXml)
 #endif  // defined(OS_WIN)
 
 #if defined(OS_MACOSX)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_ParseIPhotoLibraryXmlFile,
@@ skipping 12 matching lines @@
 #if defined(OS_WIN)
     IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_GetWiFiCredentials,
                         OnGetWiFiCredentials)
 #endif  // defined(OS_WIN)
 
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled || utility_handler_.OnMessageReceived(message);
 }
 
-void ExtensionsHandler::OnUnpackExtension(
-    const base::FilePath& extension_path,
-    const std::string& extension_id,
-    int location,
-    int creation_flags) {
-  CHECK_GT(location, Manifest::INVALID_LOCATION);
-  CHECK_LT(location, Manifest::NUM_LOCATIONS);
-  ExtensionsClient::Set(ChromeExtensionsClient::GetInstance());
-  Unpacker unpacker(extension_path,
-                    extension_id,
-                    static_cast<Manifest::Location>(location),
-                    creation_flags);
-  if (unpacker.Run() && unpacker.DumpImagesToFile() &&
-      unpacker.DumpMessageCatalogsToFile()) {
-    Send(new ChromeUtilityHostMsg_UnpackExtension_Succeeded(
-        *unpacker.parsed_manifest()));
-  } else {
-    Send(new ChromeUtilityHostMsg_UnpackExtension_Failed(
-        unpacker.error_message()));
-  }
-
-  ReleaseProcessIfNeeded();
-}
-
 void ExtensionsHandler::OnUnzipToDir(const base::FilePath& zip_path,
                                      const base::FilePath& dir) {
   if (!zip::Unzip(zip_path, dir)) {
     Send(new ChromeUtilityHostMsg_UnzipToDir_Failed(
         std::string(kExtensionHandlerUnzipError)));
   } else {
     Send(new ChromeUtilityHostMsg_UnzipToDir_Succeeded(dir));
   }
 
   ReleaseProcessIfNeeded();
@@ skipping 102 matching lines @@
 
   std::string key_data;
   std::string error;
   wifi_service->GetKeyFromSystem(network_guid, &key_data, &error);
 
   Send(new ChromeUtilityHostMsg_GotWiFiCredentials(key_data, error.empty()));
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace extensions