Move UtilityProcessHost to content and move the message sending/dispatching to the clients. This...

chrome/browser/extensions/sandboxed_extension_unpacker.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_SANDBOXED_EXTENSION_UNPACKER_H_
 #define CHROME_BROWSER_EXTENSIONS_SANDBOXED_EXTENSION_UNPACKER_H_
 #pragma once
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/scoped_temp_dir.h"
-#include "chrome/browser/utility_process_host.h"
+#include "content/browser/utility_process_host.h"
 
 class DictionaryValue;
 class Extension;
 class ResourceDispatcherHost;
 
 class SandboxedExtensionUnpackerClient
     : public base::RefCountedThreadSafe<SandboxedExtensionUnpackerClient> {
  public:
   // temp_dir - A temporary directory containing the results of the extension
   // unpacking. The client is responsible for deleting this directory.
@@ skipping 155 matching lines @@
   // in ExtensionUnpacker as it is not specific to sandboxed unpacking. It was
   // put here because we cannot run windows crypto code in the sandbox. But we
   // could still have this method statically on ExtensionUnpacker so that code
   // just for unpacking is there and code just for sandboxing of unpacking is
   // here.
   bool ValidateSignature();
 
   // Starts the utility process that unpacks our extension.
   void StartProcessOnIOThread(const FilePath& temp_crx_path);
 
-  // SandboxedExtensionUnpacker
-  virtual void OnUnpackExtensionSucceeded(const DictionaryValue& manifest);
-  virtual void OnUnpackExtensionFailed(const std::string& error_message);
+  // UtilityProcessHost::Client
+  virtual bool OnMessageReceived(const IPC::Message& message);
   virtual void OnProcessCrashed(int exit_code);
 
+  // IPC message handlers.
+  void OnUnpackExtensionSucceeded(const DictionaryValue& manifest);
+  void OnUnpackExtensionFailed(const std::string& error_message);
+
   void ReportFailure(FailureReason reason, const std::string& message);
   void ReportSuccess(const DictionaryValue& original_manifest);
 
   // Overwrites original manifest with safe result from utility process.
   // Returns NULL on error. Caller owns the returned object.
   DictionaryValue* RewriteManifestFile(const DictionaryValue& manifest);
 
   // Overwrites original files with safe results from utility process.
   // Reports error and returns false if it fails.
   bool RewriteImageFiles();
@@ skipping 24 matching lines @@
   bool got_response_;
 
   // The public key that was extracted from the CRX header.
   std::string public_key_;
 
   // Time at which unpacking started. Used to compute the time unpacking takes.
   base::TimeTicks unpack_start_time_;
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_SANDBOXED_EXTENSION_UNPACKER_H_