Move UtilityProcessHost to content and move the message sending/dispatching to the clients. This allows the content layer to use the class.

BUG=76697
Review URL: http://codereview.chromium.org/6995095

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88586 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 2 insertions, 39 deletions

diff --git a/chrome/common/utility_messages.h b/chrome/common/chrome_utility_messages.h
index cb8718b..d3b7102 100644
--- a/chrome/common/utility_messages.h
+++ b/chrome/common/chrome_utility_messages.h
@@ -13,17 +13,14 @@
 #include "base/values.h"
 #include "chrome/common/extensions/update_manifest.h"
 #include "content/common/common_param_traits.h"
-#include "content/common/indexed_db_key.h"
-#include "content/common/indexed_db_param_traits.h"
 #include "content/common/serialized_script_value.h"
 #include "ipc/ipc_message_macros.h"
-#include "ipc/ipc_message_utils.h"
 #include "printing/backend/print_backend.h"
 #include "printing/page_range.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/rect.h"
 
-#define IPC_MESSAGE_START UtilityMsgStart
+#define IPC_MESSAGE_START ChromeUtilityMsgStart
 
 IPC_STRUCT_TRAITS_BEGIN(printing::PageRange)
   IPC_STRUCT_TRAITS_MEMBER(from)
@@ -84,28 +81,10 @@ IPC_MESSAGE_CONTROL5(UtilityMsg_RenderPDFPagesToMetafile,
                      int,                      // DPI
                      std::vector<printing::PageRange>)
 
-// Tell the utility process to extract the given IDBKeyPath from the
-// SerializedScriptValue vector and reply with the corresponding IDBKeys.
-IPC_MESSAGE_CONTROL3(UtilityMsg_IDBKeysFromValuesAndKeyPath,
-                     int,     // id
-                     std::vector<SerializedScriptValue>,
-                     string16)  // IDBKeyPath
-
-IPC_MESSAGE_CONTROL3(UtilityMsg_InjectIDBKey,
-                     IndexedDBKey /* key */,
-                     SerializedScriptValue /* value */,
-                     string16 /* key path*/)
-
 // Tell the utility process to parse a JSON string into a Value object.
 IPC_MESSAGE_CONTROL1(UtilityMsg_ParseJSON,
                      std::string /* JSON to parse */)
 
-// Tells the utility process that it's running in batch mode.
-IPC_MESSAGE_CONTROL0(UtilityMsg_BatchMode_Started)
-
-// Tells the utility process that it can shutdown.
-IPC_MESSAGE_CONTROL0(UtilityMsg_BatchMode_Finished)
-
 // Tells the utility process to get capabilities and defaults for the specified
 // printer. Used on Windows to isolate the service process from printer driver
 // crashes by executing this in a separate process. This does not run in a
@@ -171,22 +150,6 @@ IPC_SYNC_MESSAGE_CONTROL1_0(UtilityHostMsg_PreCacheFont,
                             LOGFONT /* font data */)
 #endif  // defined(OS_WIN)
 
-// Reply when the utility process has succeeded in obtaining the value for
-// IDBKeyPath.
-IPC_MESSAGE_CONTROL2(UtilityHostMsg_IDBKeysFromValuesAndKeyPath_Succeeded,
-                     int /* id */,
-                     std::vector<IndexedDBKey> /* value */)
-
-// Reply when the utility process has failed in obtaining the value for
-// IDBKeyPath.
-IPC_MESSAGE_CONTROL1(UtilityHostMsg_IDBKeysFromValuesAndKeyPath_Failed,
-                     int /* id */)
-
-// Reply when the utility process has finished injecting an IDBKey into
-// a SerializedScriptValue.
-IPC_MESSAGE_CONTROL1(UtilityHostMsg_InjectIDBKey_Finished,
-                     SerializedScriptValue /* new value */)
-
 // Reply when the utility process successfully parsed a JSON string.
 //
 // WARNING: The result can be of any Value subclass type, but we can't easily
diff --git a/chrome/common/common_message_generator.h b/chrome/common/common_message_generator.h
index 52b8ec2..0ba1487 100644
--- a/chrome/common/common_message_generator.h
+++ b/chrome/common/common_message_generator.h
@@ -5,6 +5,7 @@
 // Multiply-included file, hence no include guard.
 
 #include "chrome/common/autofill_messages.h"
+#include "chrome/common/chrome_utility_messages.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/icon_messages.h"
 #include "chrome/common/print_messages.h"
@@ -12,4 +13,3 @@
 #include "chrome/common/safe_browsing/safebrowsing_messages.h"
 #include "chrome/common/service_messages.h"
 #include "chrome/common/spellcheck_messages.h"
-#include "chrome/common/utility_messages.h"