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

chrome/browser/web_resource/web_resource_service.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/web_resource/web_resource_service.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/chrome_utility_messages.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/web_resource/web_resource_unpacker.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_service.h"
 #include "content/common/url_fetcher.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request_status.h"
 
 class WebResourceService::WebResourceFetcher
@@ skipping 74 matching lines @@
   // The tool that fetches the url data from the server.
   scoped_ptr<URLFetcher> url_fetcher_;
 
   // Our owner and creator. Ref counted.
   WebResourceService* web_resource_service_;
 };
 
 // This class coordinates a web resource unpack and parse task which is run in
 // a separate process.  Results are sent back to this class and routed to
 // the WebResourceService.
-class WebResourceService::UnpackerClient
-    : public UtilityProcessHost::Client {
+class WebResourceService::UnpackerClient : public UtilityProcessHost::Client {
  public:
   UnpackerClient(WebResourceService* web_resource_service,
                  const std::string& json_data)
     : web_resource_service_(web_resource_service),
       json_data_(json_data), got_response_(false) {
   }
 
   void Start() {
     AddRef();  // balanced in Cleanup.
 
@@ skipping 18 matching lines @@
       } else {
         OnUnpackWebResourceFailed(unpacker.error_message());
       }
     }
   }
 
  private:
   ~UnpackerClient() {}
 
   // UtilityProcessHost::Client
+  virtual bool OnMessageReceived(const IPC::Message& message) {
+    bool handled = true;
+    IPC_BEGIN_MESSAGE_MAP(WebResourceService::UnpackerClient, message)
+      IPC_MESSAGE_HANDLER(UtilityHostMsg_UnpackWebResource_Succeeded,
+                          OnUnpackWebResourceSucceeded)
+      IPC_MESSAGE_HANDLER(UtilityHostMsg_UnpackWebResource_Failed,
+                          OnUnpackWebResourceFailed)
+      IPC_MESSAGE_UNHANDLED(handled = false)
+    IPC_END_MESSAGE_MAP_EX()
+    return handled;
+  }
+
   virtual void OnProcessCrashed(int exit_code) {
     if (got_response_)
       return;
 
     OnUnpackWebResourceFailed(
         "Chrome crashed while trying to retrieve web resources.");
   }
 
-  virtual void OnUnpackWebResourceSucceeded(
+  void OnUnpackWebResourceSucceeded(
       const DictionaryValue& parsed_json) {
     web_resource_service_->OnWebResourceUnpacked(parsed_json);
     Cleanup();
   }
 
-  virtual void OnUnpackWebResourceFailed(const std::string& error_message) {
+  void OnUnpackWebResourceFailed(const std::string& error_message) {
     web_resource_service_->EndFetch();
     Cleanup();
   }
 
   // Release reference and set got_response_.
   void Cleanup() {
     if (got_response_)
       return;
 
     got_response_ = true;
     Release();
   }
 
   void StartProcessOnIOThread(BrowserThread::ID thread_id) {
     UtilityProcessHost* host = new UtilityProcessHost(this, thread_id);
     // TODO(mrc): get proper file path when we start using web resources
     // that need to be unpacked.
-    host->StartWebResourceUnpacker(json_data_);
+    host->Send(new UtilityMsg_UnpackWebResource(json_data_));
   }
 
   scoped_refptr<WebResourceService> web_resource_service_;
 
   // Holds raw JSON string.
   const std::string& json_data_;
 
   // True if we got a response from the utility process and have cleaned up
   // already.
   bool got_response_;
@@ skipping 86 matching lines @@
 }
 
 void WebResourceService::UpdateResourceCache(const std::string& json_data) {
   UnpackerClient* client = new UnpackerClient(this, json_data);
   client->Start();
 
   // Set cache update time in preferences.
   prefs_->SetString(last_update_time_pref_name_,
       base::DoubleToString(base::Time::Now().ToDoubleT()));
 }