Convert message files from specific .cc implementation files to use the

new common message generator for the cases where the conversion is trivial.

BUG=none
TEST=

Review URL: http://codereview.chromium.org/6594123

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

10 files changed, 11 insertions, 55 deletions

diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index f33971a..646c0c9 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -57,7 +57,6 @@
           'common/content_settings_helper.cc',
           'common/content_settings_helper.h',
           'common/content_settings_types.h',
-          'common/database_messages.cc',
           'common/database_messages.h',
           'common/debug_flags.cc',
           'common/debug_flags.h',
@@ -74,7 +73,6 @@
           'common/file_system/webfilesystem_impl.h',
           'common/file_system/webfilewriter_impl.cc',
           'common/file_system/webfilewriter_impl.h',
-          'common/file_utilities_messages.cc',
           'common/file_utilities_messages.h',
           'common/font_descriptor_mac.h',
           'common/font_descriptor_mac.mm',
@@ -115,7 +113,6 @@
           'common/message_router.h',
           'common/metrics_helpers.cc',
           'common/metrics_helpers.h',
-          'common/mime_registry_messages.cc',
           'common/mime_registry_messages.h',
           'common/multi_process_lock.h',
           'common/multi_process_lock_linux.cc',
@@ -153,7 +150,6 @@
           'common/resource_response.cc',
           'common/resource_response.h',
           'common/result_codes.h',
-	  'common/safebrowsing_messages.cc',
 	  'common/safebrowsing_messages.h',
           'common/sandbox_init_wrapper.h',
           'common/sandbox_init_wrapper_linux.cc',
diff --git a/chrome/common/common_message_generator.h b/chrome/common/common_message_generator.h
index 3a31c77..946baee 100644
--- a/chrome/common/common_message_generator.h
+++ b/chrome/common/common_message_generator.h
@@ -4,18 +4,19 @@
 
 // Multiply-included file, hence no include guard.
 
+#include "chrome/common/database_messages.h"
+#include "chrome/common/file_utilities_messages.h"
 #include "chrome/common/indexed_db_messages.h"
+#include "chrome/common/mime_registry_messages.h"
+#include "chrome/common/safebrowsing_messages.h"
 
 #if 0  // This feature is not yet enabled for these files.
 
 #include "chrome/common/autofill_messages.h"
 #include "chrome/common/automation_messages.h"
-#include "chrome/common/database_messages.h"
 #include "chrome/common/devtools_messages.h"
 #include "chrome/common/dom_storage_messages.h"
-#include "chrome/common/file_utilities_messages.h"
 #include "chrome/common/gpu_messages.h"
-#include "chrome/common/mime_registry_messages.h"
 #include "chrome/common/nacl_messages.h"
 #include "chrome/common/pepper_file_messages.h"
 #include "chrome/common/pepper_messages.h"
diff --git a/chrome/common/database_messages.cc b/chrome/common/database_messages.cc
deleted file mode 100644
index 0b1b5d9..0000000
--- a/chrome/common/database_messages.cc
+++ /dev/null
@@ -1,8 +0,0 @@
-// 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.
-
-#include "chrome/common/common_param_traits.h"
-
-#define IPC_MESSAGE_IMPL
-#include "chrome/common/database_messages.h"
diff --git a/chrome/common/database_messages.h b/chrome/common/database_messages.h
index bb910b0..7cf64a1 100644
--- a/chrome/common/database_messages.h
+++ b/chrome/common/database_messages.h
@@ -2,9 +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_DATABASE_MESSAGES_H_
-#define CHROME_COMMON_DATABASE_MESSAGES_H_
-#pragma once
+// Multiply-included message file, no include guard.
 
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_param_traits.h"
@@ -76,4 +74,3 @@ IPC_MESSAGE_CONTROL2(DatabaseHostMsg_Closed,
                      string16 /* origin identifier */,
                      string16 /* database name */)
 
-#endif  // CHROME_COMMON_DATABASE_MESSAGES_H_
diff --git a/chrome/common/file_utilities_messages.cc b/chrome/common/file_utilities_messages.cc
deleted file mode 100644
index b1236ae..0000000
--- a/chrome/common/file_utilities_messages.cc
+++ /dev/null
@@ -1,8 +0,0 @@
-// 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.
-
-#include "chrome/common/common_param_traits.h"
-
-#define IPC_MESSAGE_IMPL
-#include "chrome/common/file_utilities_messages.h"
diff --git a/chrome/common/file_utilities_messages.h b/chrome/common/file_utilities_messages.h
index 6b8157d..eb35263 100644
--- a/chrome/common/file_utilities_messages.h
+++ b/chrome/common/file_utilities_messages.h
@@ -2,11 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_FILE_UTILITIES_MESSAGES_H_
-#define CHROME_COMMON_FILE_UTILITIES_MESSAGES_H_
-#pragma once
+// Multiply-included message file, so no include guard.
 
 #include "base/time.h"
+#include "chrome/common/common_param_traits.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_param_traits.h"
 #include "ipc/ipc_platform_file.h"
@@ -32,4 +31,3 @@ IPC_SYNC_MESSAGE_CONTROL2_1(FileUtilitiesMsg_OpenFile,
                             int /* mode */,
                             IPC::PlatformFileForTransit /* result */)
 
-#endif  // CHROME_COMMON_FILE_UTILITIES_MESSAGES_H_
diff --git a/chrome/common/mime_registry_messages.cc b/chrome/common/mime_registry_messages.cc
deleted file mode 100644
index e8c2b9b..0000000
--- a/chrome/common/mime_registry_messages.cc
+++ /dev/null
@@ -1,8 +0,0 @@
-// 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.
-
-#include "chrome/common/common_param_traits.h"
-
-#define IPC_MESSAGE_IMPL
-#include "chrome/common/mime_registry_messages.h"
diff --git a/chrome/common/mime_registry_messages.h b/chrome/common/mime_registry_messages.h
index 636009f..ba6ebe4 100644
--- a/chrome/common/mime_registry_messages.h
+++ b/chrome/common/mime_registry_messages.h
@@ -2,11 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_MIME_REGISTRY_MESSAGES_H_
-#define CHROME_COMMON_MIME_REGISTRY_MESSAGES_H_
-#pragma once
+// Multiply-included message file, so no include guard.
 
 #include "base/file_path.h"
+#include "chrome/common/common_param_traits.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_param_traits.h"
 
@@ -25,4 +24,3 @@ IPC_SYNC_MESSAGE_CONTROL1_1(MimeRegistryMsg_GetPreferredExtensionForMimeType,
                             std::string /* mime_type */,
                             FilePath::StringType /* extension */)
 
-#endif  // CHROME_COMMON_MIME_REGISTRY_MESSAGES_H_
diff --git a/chrome/common/safebrowsing_messages.cc b/chrome/common/safebrowsing_messages.cc
deleted file mode 100644
index b10de4b..0000000
--- a/chrome/common/safebrowsing_messages.cc
+++ /dev/null
@@ -1,8 +0,0 @@
-// 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.
-
-#include "chrome/common/common_param_traits.h"
-
-#define IPC_MESSAGE_IMPL
-#include "chrome/common/safebrowsing_messages.h"
diff --git a/chrome/common/safebrowsing_messages.h b/chrome/common/safebrowsing_messages.h
index 072d3c6..71877ad 100644
--- a/chrome/common/safebrowsing_messages.h
+++ b/chrome/common/safebrowsing_messages.h
@@ -2,10 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_SAFEBROWSING_MESSAGES_H_
-#define CHROME_COMMON_SAFEBROWSING_MESSAGES_H_
-#pragma once
+// Multiply-included message file, so no include guard.
 
+#include "chrome/common/common_param_traits.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_message_macros.h"
 
@@ -23,4 +22,3 @@ IPC_MESSAGE_ROUTED2(SafeBrowsingDetectionHostMsg_DetectedPhishingSite,
 // SafeBrowsing client-side detection messages sent from the browser to the
 // renderer.  TODO(noelutz): move other IPC messages here.
 
-#endif  // CHROME_COMMON_SAFEBROWSING_MESSAGES_H_