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

chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.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.
 //
 // Note: this test uses RenderViewFakeResourcesTest in order to set up a
 // real RenderThread to hold the phishing Scorer object.
 
 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h"
 
 #include "base/scoped_ptr.h"
@@ skipping 43 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(MockScorer);
 };
 }  // namespace
 
 class PhishingClassifierDelegateTest : public RenderViewFakeResourcesTest {
  protected:
   bool OnMessageReceived(const IPC::Message& message) {
     bool handled = true;
     IPC_BEGIN_MESSAGE_MAP(PhishingClassifierDelegateTest, message)
-        IPC_MESSAGE_HANDLER(SafeBrowsingDetectionHostMsg_DetectedPhishingSite,
+        IPC_MESSAGE_HANDLER(SafeBrowsingHostMsg_DetectedPhishingSite,
                             OnDetectedPhishingSite)
       IPC_MESSAGE_UNHANDLED(
           handled = RenderViewFakeResourcesTest::OnMessageReceived(message))
     IPC_END_MESSAGE_MAP()
     return handled;
   }
 
   void OnDetectedPhishingSite(GURL phishing_url, double phishing_score) {
     detected_phishing_site_ = true;
     detected_url_ = phishing_url;
@@ skipping 232 matching lines @@
   RunClassificationDone(delegate, true, 0.8);
   EXPECT_TRUE(detected_phishing_site_);
   EXPECT_EQ(GURL("http://host.com/"), detected_url_);
   EXPECT_EQ(0.8, detected_score_);
 
   // The delegate will cancel pending classification on destruction.
   EXPECT_CALL(*classifier, CancelPendingClassification());
 }
 
 }  // namespace safe_browsing