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

chrome/browser/safe_browsing/malware_details.cc

 // 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.
 //
 // Implementation of the MalwareDetails class.
 
 #include "chrome/browser/safe_browsing/malware_details.h"
 
 #include "base/lazy_instance.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/safe_browsing/report.pb.h"
-#include "chrome/common/render_messages.h"
-#include "chrome/common/render_messages_params.h"
+#include "chrome/common/safebrowsing_messages.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents.h"
 
 using safe_browsing::ClientMalwareReportRequest;
 
 // Keep in sync with KMaxNodes in renderer/safe_browsing/malware_dom_details
 static const uint32 kMaxDomNodes = 500;
 
@@ skipping 42 matching lines @@
     : TabContentsObserver(tab_contents),
       resource_(resource) {
   StartCollection();
 }
 
 MalwareDetails::~MalwareDetails() {}
 
 bool MalwareDetails::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(MalwareDetails, message)
-    IPC_MESSAGE_HANDLER(ViewHostMsg_MalwareDOMDetails,
+    IPC_MESSAGE_HANDLER(SafeBrowsingHostMsg_MalwareDOMDetails,
                         OnReceivedMalwareDOMDetails)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 bool MalwareDetails::IsPublicUrl(const GURL& url) const {
   return url.SchemeIs("http");  // TODO(panayiotis): also skip internal urls.
 }
 
@@ skipping 102 matching lines @@
     AddUrl(referrer_url, GURL(), "", NULL);
   }
 
   // Get URLs of frames, scripts etc from the DOM.
   // OnReceivedMalwareDOMDetails will be called when the renderer replies.
   tab_contents()->render_view_host()->GetMalwareDOMDetails();
 }
 
 // When the renderer is done, this is called.
 void MalwareDetails::OnReceivedMalwareDOMDetails(
-    const ViewHostMsg_MalwareDOMDetails_Params& params) {
+    const std::vector<SafeBrowsingHostMsg_MalwareDOMDetails_Node>& params) {
   // Schedule this in IO thread, so it doesn't conflict with future users
   // of our data structures (eg GetSerializedReport).
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(
           this, &MalwareDetails::AddDOMDetails, params));
 }
 
 void MalwareDetails::AddDOMDetails(
-    const ViewHostMsg_MalwareDOMDetails_Params& params) {
+    const std::vector<SafeBrowsingHostMsg_MalwareDOMDetails_Node>& params) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   // Add the urls from the DOM to |resources_|.  The renderer could be
   // sending bogus messages, so limit the number of nodes we accept.
-  DVLOG(1) << "Nodes from the DOM: " << params.nodes.size();
-  for (uint32 i = 0; i < params.nodes.size() && i < kMaxDomNodes; ++i) {
-    ViewHostMsg_MalwareDOMDetails_Node node = params.nodes[i];
+  DVLOG(1) << "Nodes from the DOM: " << params.size();
+  for (uint32 i = 0; i < params.size() && i < kMaxDomNodes; ++i) {
+    SafeBrowsingHostMsg_MalwareDOMDetails_Node node = params[i];
     DVLOG(1) << node.url << ", " << node.tag_name << ", " << node.parent;
     AddUrl(node.url, node.parent, node.tag_name, &(node.children));
   }
 }
 
 // Called from the SB Service on the IO thread, after the user has
 // closed the tab, or clicked proceed or goback.  Since the user needs
 // to take an action, we expect this to be called after
 // OnReceivedMalwareDOMDetails in most cases. If not, we don't include
 // the DOM data in our report.
 const std::string* MalwareDetails::GetSerializedReport() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   // The |report_| protocol buffer is now generated: We add all the
   // urls in our |resources_| maps.
   for (ResourceMap::const_iterator it = resources_.begin();
        it != resources_.end(); it++) {
     ClientMalwareReportRequest::Resource* pb_resource =
         report_->add_resources();
     pb_resource->CopyFrom(*(it->second));
   }
 
   scoped_ptr<std::string> request_data(new std::string());
   if (!report_->SerializeToString(request_data.get())) {
     DLOG(ERROR) << "Unable to serialize the malware report.";
   }
 
   return request_data.release();
 }