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.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 "chrome/renderer/safe_browsing/phishing_classifier_delegate.h"
 
 #include <set>
 
 #include "base/callback.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/scoped_callback_factory.h"
-#include "chrome/common/render_messages.h"
 #include "chrome/common/safebrowsing_messages.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/safe_browsing/feature_extractor_clock.h"
 #include "chrome/renderer/safe_browsing/phishing_classifier.h"
 #include "chrome/renderer/safe_browsing/scorer.h"
 #include "content/renderer/navigation_state.h"
 #include "content/renderer/render_view.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
@@ skipping 120 matching lines @@
   if (classifier_->is_ready()) {
     classifier_->CancelPendingClassification();
   }
   classifier_page_text_.clear();
 }
 
 bool PhishingClassifierDelegate::OnMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PhishingClassifierDelegate, message)
-    IPC_MESSAGE_HANDLER(ViewMsg_StartPhishingDetection,
+    IPC_MESSAGE_HANDLER(SafeBrowsingMsg_StartPhishingDetection,
                         OnStartPhishingDetection)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void PhishingClassifierDelegate::ClassificationDone(bool is_phishy,
                                                     double phishy_score) {
   // We no longer need the page text.
   classifier_page_text_.clear();
   VLOG(2) << "Phishy verdict = " << is_phishy << " score = " << phishy_score;
   if (!is_phishy) {
     return;
   }
 
-  Send(new SafeBrowsingDetectionHostMsg_DetectedPhishingSite(
+  Send(new SafeBrowsingHostMsg_DetectedPhishingSite(
       routing_id(),
       last_url_sent_to_classifier_,
       phishy_score));
 }
 
 GURL PhishingClassifierDelegate::StripToplevelUrl() {
   return StripRef(render_view()->webview()->mainFrame()->url());
 }
 
 void PhishingClassifierDelegate::MaybeStartClassification() {
@@ skipping 54 matching lines @@
 
   VLOG(2) << "Starting classification for " << last_finished_load_url_;
   last_url_sent_to_classifier_ = last_finished_load_url_;
   last_page_id_sent_to_classifier_ = last_finished_load_id_;
   classifier_->BeginClassification(
       &classifier_page_text_,
       NewCallback(this, &PhishingClassifierDelegate::ClassificationDone));
 }
 
 }  // namespace safe_browsing