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

chrome/browser/extensions/extension_webstore_private_api.cc

 // 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.
 
 #include "chrome/browser/extensions/extension_webstore_private_api.h"
 
 #include <string>
 #include <vector>
 
 #include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_install_dialog.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/net/gaia/token_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/chrome_utility_messages.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
 #include "content/common/notification_type.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ skipping 141 matching lines @@
                           &SafeBeginInstallHelper::StartWorkOnIOThread));
   }
 
   void StartWorkOnIOThread() {
     CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     utility_host_ = new UtilityProcessHost(this, BrowserThread::IO);
     utility_host_->StartBatchMode();
     if (icon_data_.empty())
       icon_decode_complete_ = true;
     else
-      utility_host_->StartImageDecodingBase64(icon_data_);
-    utility_host_->StartJSONParsing(manifest_);
+      utility_host_->Send(new UtilityMsg_DecodeImageBase64(icon_data_));
+    utility_host_->Send(new UtilityMsg_ParseJSON(manifest_));
   }
 
   // Implementing pieces of the UtilityProcessHost::Client interface.
-  virtual void OnDecodeImageSucceeded(const SkBitmap& decoded_image) {
+  virtual bool OnMessageReceived(const IPC::Message& message) {
+    bool handled = true;
+    IPC_BEGIN_MESSAGE_MAP(SafeBeginInstallHelper, message)
+      IPC_MESSAGE_HANDLER(UtilityHostMsg_DecodeImage_Succeeded,
+                          OnDecodeImageSucceeded)
+      IPC_MESSAGE_HANDLER(UtilityHostMsg_DecodeImage_Failed,
+                          OnDecodeImageFailed)
+      IPC_MESSAGE_HANDLER(UtilityHostMsg_ParseJSON_Succeeded,
+                          OnJSONParseSucceeded)
+      IPC_MESSAGE_HANDLER(UtilityHostMsg_ParseJSON_Failed, OnJSONParseFailed)
+      IPC_MESSAGE_UNHANDLED(handled = false)
+    IPC_END_MESSAGE_MAP_EX()
+    return handled;
+  }
+
+  void OnDecodeImageSucceeded(const SkBitmap& decoded_image) {
     CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     icon_ = decoded_image;
     icon_decode_complete_ = true;
     ReportResultsIfComplete();
   }
-  virtual void OnDecodeImageFailed() {
+
+  void OnDecodeImageFailed() {
     CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     icon_decode_complete_ = true;
     error_ = std::string(kImageDecodeError);
     parse_error_ = BeginInstallWithManifestFunction::ICON_ERROR;
     ReportResultsIfComplete();
   }
-  virtual void OnJSONParseSucceeded(const ListValue& wrapper) {
+
+  void OnJSONParseSucceeded(const ListValue& wrapper) {
     CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     manifest_parse_complete_ = true;
     Value* value = NULL;
     CHECK(wrapper.Get(0, &value));
     if (value->IsType(Value::TYPE_DICTIONARY)) {
       parsed_manifest_.reset(
           static_cast<DictionaryValue*>(value)->DeepCopy());
     } else {
       parse_error_ = BeginInstallWithManifestFunction::MANIFEST_ERROR;
     }
@@ skipping 415 matching lines @@
   }
 
   DCHECK(waiting_for_token_);
 
   result_.reset(CreateLoginResult(profile_->GetOriginalProfile()));
   SendResponse(true);
 
   // Matches the AddRef in RunImpl().
   Release();
 }