Introduce bad_message.h for chrome and NaCl.

content/browser/renderer_host/database_message_filter.cc

Index: content/browser/renderer_host/database_message_filter.cc
diff --git a/content/browser/renderer_host/database_message_filter.cc b/content/browser/renderer_host/database_message_filter.cc
index 4b37773dd2aa47d69d61fa5bdec0938a0eec6397..31b726ac7ff7b4de77f4036b7c40d351b4be945e 100644
--- a/content/browser/renderer_host/database_message_filter.cc
+++ b/content/browser/renderer_host/database_message_filter.cc
@@ -10,6 +10,7 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread.h"
+#include "content/browser/bad_message.h"
 #include "content/common/database_messages.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/result_codes.h"
@@ -295,8 +296,8 @@ void DatabaseMessageFilter::OnDatabaseOpened(
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
 
   if (!DatabaseUtil::IsValidOriginIdentifier(origin_identifier)) {
-    RecordAction(base::UserMetricsAction("BadMessageTerminate_DBMF"));
-    BadMessageReceived();
+    bad_message::ReceivedBadMessage(this,
+                                    bad_message::DBMF_INVALID_ORIGIN_ON_OPEN);
     return;
   }
 
@@ -314,8 +315,8 @@ void DatabaseMessageFilter::OnDatabaseModified(
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   if (!database_connections_.IsDatabaseOpened(
           origin_identifier, database_name)) {
-    RecordAction(base::UserMetricsAction("BadMessageTerminate_DBMF"));
-    BadMessageReceived();
+    bad_message::ReceivedBadMessage(this,
+                                    bad_message::DBMF_DB_NOT_OPEN_ON_MODIFY);
     return;
   }
 
@@ -328,8 +329,8 @@ void DatabaseMessageFilter::OnDatabaseClosed(
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   if (!database_connections_.IsDatabaseOpened(
           origin_identifier, database_name)) {
-    RecordAction(base::UserMetricsAction("BadMessageTerminate_DBMF"));
-    BadMessageReceived();
+    bad_message::ReceivedBadMessage(this,
+                                    bad_message::DBMF_DB_NOT_OPEN_ON_CLOSE);
     return;
   }
 
@@ -343,8 +344,8 @@ void DatabaseMessageFilter::OnHandleSqliteError(
     int error) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   if (!DatabaseUtil::IsValidOriginIdentifier(origin_identifier)) {
-    RecordAction(base::UserMetricsAction("BadMessageTerminate_DBMF"));
-    BadMessageReceived();
+    bad_message::ReceivedBadMessage(
+        this, bad_message::DBMF_INVALID_ORIGIN_ON_HANDLE_ERROR);

[Charlie Reis, 2015/05/22 20:55:51]

DBMF_INVALID_ORIGIN_ON_SQLITE_ERROR?

[ncarter (slow), 2015/05/26 22:59:04]

Done.

     return;
   }