Move the rest of the renderer->browser messages that belong in content. Also do a bunch of cleanup:

chrome/common/safebrowsing_messages.h

Index: chrome/common/safebrowsing_messages.h
===================================================================
--- chrome/common/safebrowsing_messages.h	(revision 79188)
+++ chrome/common/safebrowsing_messages.h	(working copy)
@@ -4,21 +4,54 @@
 
 // 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"
+#include "ipc/ipc_platform_file.h"
 
 #define IPC_MESSAGE_START SafeBrowsingMsgStart
 
+// A node is essentially a frame.
+IPC_STRUCT_BEGIN(SafeBrowsingHostMsg_MalwareDOMDetails_Node)
+  // URL of this resource. Can be empty.
+  IPC_STRUCT_MEMBER(GURL, url)
+
+  // If this resource was in the "src" attribute of a tag, this is the tagname
+  // (eg "IFRAME"). Can be empty.
+  IPC_STRUCT_MEMBER(std::string, tag_name)
+
+  // URL of the parent node. Can be empty.
+  IPC_STRUCT_MEMBER(GURL, parent)
+
+  // children of this node. Can be emtpy.
+  IPC_STRUCT_MEMBER(std::vector<GURL>, children)
+IPC_STRUCT_END()
+
 // SafeBrowsing client-side detection messages sent from the renderer to the
 // browser.
 
 // Inform the browser that the current URL is phishing according to the
 // client-side phishing detector.
-IPC_MESSAGE_ROUTED2(SafeBrowsingDetectionHostMsg_DetectedPhishingSite,
+IPC_MESSAGE_ROUTED2(SafeBrowsingHostMsg_DetectedPhishingSite,
                     GURL /* phishing_url */,
                     double /* phishing_score */)
 
+// Send part of the DOM to the browser, to be used in a malware report.
+IPC_MESSAGE_ROUTED1(SafeBrowsingHostMsg_MalwareDOMDetails,
+                    std::vector<SafeBrowsingHostMsg_MalwareDOMDetails_Node>)
+
 // SafeBrowsing client-side detection messages sent from the browser to the
-// renderer.  TODO(noelutz): move other IPC messages here.
+// renderer.
 
+// A classification model for client-side phishing detection.
+// The given file contains an encoded safe_browsing::ClientSideModel
+// protocol buffer.
+IPC_MESSAGE_CONTROL1(SafeBrowsingMsg_SetPhishingModel,
+                     IPC::PlatformFileForTransit /* model_file */)
+
+// Request a DOM tree when a malware interstitial is shown.
+IPC_MESSAGE_ROUTED0(SafeBrowsingMsg_GetMalwareDOMDetails)
+
+// Tells the renderer to begin phishing detection for the given toplevel URL
+// which it has started loading.
+IPC_MESSAGE_ROUTED1(SafeBrowsingMsg_StartPhishingDetection,
+                    GURL)