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

chrome/common/automation_messages.h

Index: chrome/common/automation_messages.h
===================================================================
--- chrome/common/automation_messages.h	(revision 78252)
+++ chrome/common/automation_messages.h	(working copy)
@@ -2,10 +2,7 @@
 // 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"
@@ -14,10 +11,16 @@
 #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;
@@ -355,6 +358,9 @@
 
 }  // 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__