Convert dom_storage, pepper, pepper_file, and automation messages to new form...

chrome/common/automation_messages.h

 // Copyright (c) 2010 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_AUTOMATION_MESSAGES_H__
-#define CHROME_COMMON_AUTOMATION_MESSAGES_H__
-#pragma once
-
+// Multiply-included message file, no traditional include guard.
 #include <string>
 
 #include "base/basictypes.h"
 #include "chrome/common/automation_constants.h"
 #include "chrome/common/common_param_traits.h"
 #include "chrome/common/page_type.h"
 #include "chrome/common/security_style.h"
 #include "content/common/common_param_traits.h"
+#include "ipc/ipc_message_macros.h"
+#include "ipc/ipc_message_utils.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/upload_data.h"
 #include "ui/gfx/rect.h"
 
+// Singly-included section, not yet converted.
+#ifndef CHROME_COMMON_AUTOMATION_MESSAGES_H__
+#define CHROME_COMMON_AUTOMATION_MESSAGES_H__
+
 struct AutomationMsg_Find_Params {
   // Unused value, which exists only for backwards compat.
   int unused;
 
   // The word(s) to find on the page.
   string16 search_string;
 
   // Whether to search forward or backward within the page.
   bool forward;
 
@@ skipping 317 matching lines @@
 template <>
 struct ParamTraits<AttachExternalTabParams> {
   typedef AttachExternalTabParams param_type;
   static void Write(Message* m, const param_type& p);
   static bool Read(const Message* m, void** iter, param_type* p);
   static void Log(const param_type& p, std::string* l);
 };
 
 }  // namespace IPC
 
+#endif  // CHROME_COMMON_AUTOMATION_MESSAGES_H__
+
+// Keep this internal message file unchanged to preserve line numbering
+// (and hence the dubious __LINE__-based message numberings) across versions.
 #include "chrome/common/automation_messages_internal.h"
 
-#endif  // CHROME_COMMON_AUTOMATION_MESSAGES_H__