Move the utility process messages to their own file now that we have more than

16 message types.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/460119

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

4 files changed, 132 insertions, 93 deletions

diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index ce25321..9e2e6fc 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -21,7 +21,6 @@
 #include "chrome/common/css_colors.h"
 #include "chrome/common/dom_storage_type.h"
 #include "chrome/common/edit_command.h"
-#include "chrome/common/extensions/update_manifest.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "chrome/common/filter_policy.h"
 #include "chrome/common/navigation_gesture.h"
@@ -2113,39 +2112,6 @@ struct SimilarTypeTraits<ViewType::Type> {
   typedef int Type;
 };
 
-// Traits for UpdateManifest::Result.
-template <>
-struct ParamTraits<UpdateManifest::Result> {
-  typedef UpdateManifest::Result param_type;
-  static void Write(Message* m, const param_type& p) {
-    WriteParam(m, p.extension_id);
-    WriteParam(m, p.version);
-    WriteParam(m, p.browser_min_version);
-    WriteParam(m, p.package_hash);
-    WriteParam(m, p.crx_url);
-  }
-  static bool Read(const Message* m, void** iter, param_type* p) {
-    return ReadParam(m, iter, &p->extension_id) &&
-           ReadParam(m, iter, &p->version) &&
-           ReadParam(m, iter, &p->browser_min_version) &&
-           ReadParam(m, iter, &p->package_hash) &&
-           ReadParam(m, iter, &p->crx_url);
-  }
-  static void Log(const param_type& p, std::wstring* l) {
-    l->append(L"(");
-    LogParam(p.extension_id, l);
-    l->append(L", ");
-    LogParam(p.version, l);
-    l->append(L", ");
-    LogParam(p.browser_min_version, l);
-    l->append(L", ");
-    LogParam(p.package_hash, l);
-    l->append(L", ");
-    LogParam(p.crx_url, l);
-    l->append(L")");
-  }
-};
-
 // Traits for URLPattern.
 template <>
 struct ParamTraits<URLPattern> {
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index e8d8676..d043b29 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -802,25 +802,6 @@ IPC_BEGIN_MESSAGES(View)
                        bool /* on or off */)
 #endif
 
-  //---------------------------------------------------------------------------
-  // Utility process messages:
-  // These are messages from the browser to the utility process.  They're here
-  // because we ran out of spare message types.
-
-  // Tell the utility process to unpack the given extension file in its
-  // directory and verify that it is valid.
-  IPC_MESSAGE_CONTROL1(UtilityMsg_UnpackExtension,
-                       FilePath /* extension_filename */)
-
-  // Tell the utility process to parse the given JSON data and verify its
-  // validity.
-  IPC_MESSAGE_CONTROL1(UtilityMsg_UnpackWebResource,
-                       std::string /* JSON data */)
-
-  // Tell the utility process to parse the given xml document.
-  IPC_MESSAGE_CONTROL1(UtilityMsg_ParseUpdateManifest,
-                       std::string /* xml document contents */)
-
   // Socket Stream messages:
   // These are messages from the browser to the SocketStreamHandle on
   // a renderer.
@@ -1924,46 +1905,6 @@ IPC_BEGIN_MESSAGES(ViewHost)
                               FilePath /* path */,
                               int64 /* result */)
 
-  //---------------------------------------------------------------------------
-  // Utility process host messages:
-  // These are messages from the utility process to the browser.  They're here
-  // because we ran out of spare message types.
-
-  // Reply when the utility process is done unpacking an extension.  |manifest|
-  // is the parsed manifest.json file.  |catalogs| is the list of all parsed
-  // message catalogs and relative paths to them.
-  // The unpacker should also have written out a file containing decoded images
-  // from the extension.  See ExtensionUnpacker for details.
-  IPC_MESSAGE_CONTROL2(UtilityHostMsg_UnpackExtension_Succeeded,
-                       DictionaryValue /* manifest */,
-                       DictionaryValue /* catalogs */)
-
-  // Reply when the utility process has failed while unpacking an extension.
-  // |error_message| is a user-displayable explanation of what went wrong.
-  IPC_MESSAGE_CONTROL1(UtilityHostMsg_UnpackExtension_Failed,
-                       std::string /* error_message, if any */)
-
-  // Reply when the utility process is done unpacking and parsing JSON data
-  // from a web resource.
-  IPC_MESSAGE_CONTROL1(UtilityHostMsg_UnpackWebResource_Succeeded,
-                       DictionaryValue /* json data */)
-
-  // Reply when the utility process has failed while unpacking and parsing a
-  // web resource.  |error_message| is a user-readable explanation of what
-  // went wrong.
-  IPC_MESSAGE_CONTROL1(UtilityHostMsg_UnpackWebResource_Failed,
-                       std::string /* error_message, if any */)
-
-  // Reply when the utility process has succeeded in parsing an update manifest
-  // xml document.
-  IPC_MESSAGE_CONTROL1(UtilityHostMsg_ParseUpdateManifest_Succeeded,
-                       std::vector<UpdateManifest::Result> /* updates */)
-
-  // Reply when an error occured parsing the update manifest. |error_message|
-  // is a description of what went wrong suitable for logging.
-  IPC_MESSAGE_CONTROL1(UtilityHostMsg_ParseUpdateManifest_Failed,
-                       std::string /* error_message, if any */)
-
   // Sent by the renderer process to acknowledge receipt of a
   // ViewMsg_CSSInsertRequest message and css has been inserted into the frame.
   IPC_MESSAGE_ROUTED0(ViewHostMsg_OnCSSInserted)
diff --git a/chrome/common/utility_messages.h b/chrome/common/utility_messages.h
new file mode 100644
index 0000000..eccdc14
--- /dev/null
+++ b/chrome/common/utility_messages.h
@@ -0,0 +1,58 @@
+// Copyright (c) 2009 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_COMMON_UTILITY_MESSAGES_H_
+#define CHROME_COMMON_UTILITY_MESSAGES_H_
+
+#include <string>
+#include <vector>
+
+#include "base/basictypes.h"
+#include "base/file_path.h"
+#include "base/values.h"
+#include "chrome/common/common_param_traits.h"
+#include "chrome/common/extensions/update_manifest.h"
+#include "ipc/ipc_message_utils.h"
+
+namespace IPC {
+
+// Traits for UpdateManifest::Result.
+template <>
+struct ParamTraits<UpdateManifest::Result> {
+  typedef UpdateManifest::Result param_type;
+  static void Write(Message* m, const param_type& p) {
+    WriteParam(m, p.extension_id);
+    WriteParam(m, p.version);
+    WriteParam(m, p.browser_min_version);
+    WriteParam(m, p.package_hash);
+    WriteParam(m, p.crx_url);
+  }
+  static bool Read(const Message* m, void** iter, param_type* p) {
+    return ReadParam(m, iter, &p->extension_id) &&
+           ReadParam(m, iter, &p->version) &&
+           ReadParam(m, iter, &p->browser_min_version) &&
+           ReadParam(m, iter, &p->package_hash) &&
+           ReadParam(m, iter, &p->crx_url);
+  }
+  static void Log(const param_type& p, std::wstring* l) {
+    l->append(L"(");
+    LogParam(p.extension_id, l);
+    l->append(L", ");
+    LogParam(p.version, l);
+    l->append(L", ");
+    LogParam(p.browser_min_version, l);
+    l->append(L", ");
+    LogParam(p.package_hash, l);
+    l->append(L", ");
+    LogParam(p.crx_url, l);
+    l->append(L")");
+  }
+};
+
+}  // namespace IPC
+
+#define MESSAGES_INTERNAL_FILE "chrome/common/utility_messages_internal.h"
+#include "ipc/ipc_message_macros.h"
+
+#endif  // CHROME_COMMON_UTILITY_MESSAGES_H_
diff --git a/chrome/common/utility_messages_internal.h b/chrome/common/utility_messages_internal.h
new file mode 100644
index 0000000..4947079
--- /dev/null
+++ b/chrome/common/utility_messages_internal.h
@@ -0,0 +1,74 @@
+// Copyright (c) 2009 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.
+
+// This header is meant to be included in multiple passes, hence no traditional
+// header guard. It is included by utility_messages_internal.h
+// See ipc_message_macros.h for explanation of the macros and passes.
+
+// This file needs to be included again, even though we're actually included
+// from it via utility_messages.h.
+#include "ipc/ipc_message_macros.h"
+
+//------------------------------------------------------------------------------
+// Utility process messages:
+// These are messages from the browser to the utility process.
+IPC_BEGIN_MESSAGES(Utility)
+
+  // Tell the utility process to unpack the given extension file in its
+  // directory and verify that it is valid.
+  IPC_MESSAGE_CONTROL1(UtilityMsg_UnpackExtension,
+                       FilePath /* extension_filename */)
+
+  // Tell the utility process to parse the given JSON data and verify its
+  // validity.
+  IPC_MESSAGE_CONTROL1(UtilityMsg_UnpackWebResource,
+                       std::string /* JSON data */)
+
+  // Tell the utility process to parse the given xml document.
+  IPC_MESSAGE_CONTROL1(UtilityMsg_ParseUpdateManifest,
+                       std::string /* xml document contents */)
+
+IPC_END_MESSAGES(Utility)
+
+//------------------------------------------------------------------------------
+// Utility process host messages:
+// These are messages from the utility process to the browser.
+IPC_BEGIN_MESSAGES(UtilityHost)
+
+  // Reply when the utility process is done unpacking an extension.  |manifest|
+  // is the parsed manifest.json file.  |catalogs| is the list of all parsed
+  // message catalogs and relative paths to them.
+  // The unpacker should also have written out a file containing decoded images
+  // from the extension.  See ExtensionUnpacker for details.
+  IPC_MESSAGE_CONTROL2(UtilityHostMsg_UnpackExtension_Succeeded,
+                       DictionaryValue /* manifest */,
+                       DictionaryValue /* catalogs */)
+
+  // Reply when the utility process has failed while unpacking an extension.
+  // |error_message| is a user-displayable explanation of what went wrong.
+  IPC_MESSAGE_CONTROL1(UtilityHostMsg_UnpackExtension_Failed,
+                       std::string /* error_message, if any */)
+
+  // Reply when the utility process is done unpacking and parsing JSON data
+  // from a web resource.
+  IPC_MESSAGE_CONTROL1(UtilityHostMsg_UnpackWebResource_Succeeded,
+                       DictionaryValue /* json data */)
+
+  // Reply when the utility process has failed while unpacking and parsing a
+  // web resource.  |error_message| is a user-readable explanation of what
+  // went wrong.
+  IPC_MESSAGE_CONTROL1(UtilityHostMsg_UnpackWebResource_Failed,
+                       std::string /* error_message, if any */)
+
+  // Reply when the utility process has succeeded in parsing an update manifest
+  // xml document.
+  IPC_MESSAGE_CONTROL1(UtilityHostMsg_ParseUpdateManifest_Succeeded,
+                       std::vector<UpdateManifest::Result> /* updates */)
+
+  // Reply when an error occured parsing the update manifest. |error_message|
+  // is a description of what went wrong suitable for logging.
+  IPC_MESSAGE_CONTROL1(UtilityHostMsg_ParseUpdateManifest_Failed,
+                       std::string /* error_message, if any */)
+
+IPC_END_MESSAGES(UtilityHost)