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

content/common/content_client.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 CONTENT_COMMON_CONTENT_CLIENT_H_
 #define CONTENT_COMMON_CONTENT_CLIENT_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 12 matching lines @@
 namespace sandbox {
 class TargetPolicy;
 }
 
 namespace content {
 
 class ContentBrowserClient;
 class ContentClient;
 class ContentPluginClient;
 class ContentRendererClient;
+class ContentUtilityClient;
 
 // Setter and getter for the client.  The client should be set early, before any
 // content code is called.
 void SetContentClient(ContentClient* client);
 ContentClient* GetContentClient();
 
 // Interface that the embedder implements.
 class ContentClient {
  public:
   ContentClient();
   ~ContentClient();
 
   ContentBrowserClient* browser() { return browser_; }
   void set_browser(ContentBrowserClient* c) { browser_ = c; }
   ContentPluginClient* plugin() { return plugin_; }
-  void set_plugin(ContentPluginClient* r) { plugin_ = r; }
+  void set_plugin(ContentPluginClient* p) { plugin_ = p; }
   ContentRendererClient* renderer() { return renderer_; }
   void set_renderer(ContentRendererClient* r) { renderer_ = r; }
+  ContentUtilityClient* utility() { return utility_; }
+  void set_utility(ContentUtilityClient* u) { utility_ = u; }
 
   // Sets the currently active URL.  Use GURL() to clear the URL.
   virtual void SetActiveURL(const GURL& url) {}
 
   // Sets the data on the current gpu.
   virtual void SetGpuInfo(const GPUInfo& gpu_info) {}
 
   // Gives the embedder a chance to register its own pepper plugins.
   virtual void AddPepperPlugins(std::vector<PepperPluginInfo>* plugins) {}
 
@@ skipping 11 matching lines @@
                              sandbox::TargetPolicy* policy);
 #endif
 
  private:
   // The embedder API for participating in browser logic.
   ContentBrowserClient* browser_;
   // The embedder API for participating in plugin logic.
   ContentPluginClient* plugin_;
   // The embedder API for participating in renderer logic.
   ContentRendererClient* renderer_;
+  // The embedder API for participating in utility logic.
+  ContentUtilityClient* utility_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_CONTENT_CLIENT_H_