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

chrome/browser/safe_browsing/malware_details_unittest.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.
 
 #include <algorithm>
 
 #include "chrome/browser/safe_browsing/malware_details.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/test_render_view_host.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/test_tab_contents.h"
 
 static const char* kOriginalLandingURL = "http://www.originallandingpage.com/";
 static const char* kLandingURL = "http://www.landingpage.com/";
 static const char* kMalwareURL = "http://www.malware.com/";
 static const char* kHttpsURL = "https://www.url.com/";
 static const char* kDOMChildURL = "http://www.domparent.com/";
@@ skipping 146 matching lines @@
 TEST_F(MalwareDetailsTest, MalwareDOMDetails) {
   controller().LoadURL(GURL(kLandingURL), GURL(), PageTransition::TYPED);
 
   SafeBrowsingService::UnsafeResource resource;
   InitResource(&resource, ResourceType::SUB_RESOURCE, GURL(kMalwareURL));
 
   scoped_refptr<MalwareDetails> report = MalwareDetails::NewMalwareDetails(
       contents(), resource);
 
   // Send a message from the DOM, with 2 nodes, a parent and a child.
-  ViewHostMsg_MalwareDOMDetails_Params params;
-  ViewHostMsg_MalwareDOMDetails_Node child_node;
+  std::vector<SafeBrowsingHostMsg_MalwareDOMDetails_Node> params;
+  SafeBrowsingHostMsg_MalwareDOMDetails_Node child_node;
   child_node.url = GURL(kDOMChildURL);
   child_node.tag_name = "iframe";
   child_node.parent = GURL(kDOMParentURL);
-  params.nodes.push_back(child_node);
-  ViewHostMsg_MalwareDOMDetails_Node parent_node;
+  params.push_back(child_node);
+  SafeBrowsingHostMsg_MalwareDOMDetails_Node parent_node;
   parent_node.url = GURL(kDOMParentURL);
   parent_node.children.push_back(GURL(kDOMChildURL));
-  params.nodes.push_back(parent_node);
+  params.push_back(parent_node);
   report->OnReceivedMalwareDOMDetails(params);
 
   MessageLoop::current()->RunAllPending();
 
   scoped_ptr<const std::string> serialized(report->GetSerializedReport());
   ClientMalwareReportRequest actual;
   actual.ParseFromString(*serialized);
 
   ClientMalwareReportRequest expected;
   expected.set_malware_url(kMalwareURL);
@@ skipping 87 matching lines @@
   pb_resource->set_url(kFirstRedirectURL);
   pb_resource->set_parent_id(1);
 
   pb_resource = expected.add_resources();
   pb_resource->set_id(4);
   pb_resource->set_url(kSecondRedirectURL);
   pb_resource->set_parent_id(3);
 
   VerifyResults(actual, expected);
 }