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

content/browser/renderer_host/render_view_host.cc

 // Copyright (c) 2011 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 "content/browser/renderer_host/render_view_host.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/json/json_reader.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/dom_operation_notification_details.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/net/predictor_api.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/bindings_policy.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/url_request_context_getter.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
+#include "chrome/common/safebrowsing_messages.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/common/translate_errors.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/web_apps.h"
 #include "content/browser/child_process_security_policy.h"
 #include "content/browser/cross_site_request_manager.h"
 #include "content/browser/in_process_webkit/session_storage_namespace.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/render_widget_host.h"
@@ skipping 1271 matching lines @@
   RenderViewHostDelegate::View* view = delegate_->GetViewDelegate();
   if (view)
     view->HandleKeyboardEvent(event);
 }
 
 void RenderViewHost::OnUserGesture() {
   delegate_->OnUserGesture();
 }
 
 void RenderViewHost::GetMalwareDOMDetails() {
-  Send(new ViewMsg_GetMalwareDOMDetails(routing_id()));
+  Send(new SafeBrowsingMsg_GetMalwareDOMDetails(routing_id()));
 }
 
 void RenderViewHost::GetAllSavableResourceLinksForCurrentPage(
     const GURL& page_url) {
   Send(new ViewMsg_GetAllSavableResourceLinksForCurrentPage(routing_id(),
                                                             page_url));
 }
 
 void RenderViewHost::GetSerializedHtmlDataForCurrentPageWithLocalLinks(
     const std::vector<GURL>& links,
@@ skipping 237 matching lines @@
 void RenderViewHost::OnAccessibilityNotifications(
     const std::vector<ViewHostMsg_AccessibilityNotification_Params>& params) {
   if (view())
     view()->OnAccessibilityNotifications(params);
 
   if (!params.empty()) {
     for (unsigned i = 0; i < params.size(); i++) {
       const ViewHostMsg_AccessibilityNotification_Params& param = params[i];
 
       if (param.notification_type ==
-              ViewHostMsg_AccessibilityNotification_Params::
+              ViewHostMsg_AccessibilityNotification_Type::
                   NOTIFICATION_TYPE_LOAD_COMPLETE) {
         // TODO(ctguil): Remove when mac processes OnAccessibilityNotifications.
         if (view())
           view()->UpdateAccessibilityTree(param.acc_obj);
 
         if (save_accessibility_tree_for_testing_)
           accessibility_tree_ = param.acc_obj;
       }
     }
 
@@ skipping 88 matching lines @@
     LOG(DFATAL) << "Invalid checked state " << checked_state;
     return;
   }
 
   CommandState state;
   state.is_enabled = is_enabled;
   state.checked_state =
       static_cast<RenderViewCommandCheckedState>(checked_state);
   command_states_[static_cast<RenderViewCommand>(command)] = state;
 }