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

chrome/browser/accessibility/browser_accessibility_manager.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 "chrome/browser/accessibility/browser_accessibility_manager.h"
 
 #include "base/logging.h"
 #include "chrome/browser/accessibility/browser_accessibility.h"
-#include "chrome/common/render_messages_params.h"
+#include "content/common/view_messages.h"
 
 using webkit_glue::WebAccessibility;
 
 BrowserAccessibility* BrowserAccessibilityFactory::Create() {
   return BrowserAccessibility::Create();
 }
 
 // Start child IDs at -1 and decrement each time, because clients use
 // child IDs of 1, 2, 3, ... to access the children of an object by
 // index, so we use negative IDs to clearly distinguish between indices
@@ skipping 70 matching lines @@
   child_id_map_.erase(child_id);
   renderer_id_to_child_id_map_.erase(renderer_id);
 }
 
 void BrowserAccessibilityManager::OnAccessibilityNotifications(
     const std::vector<ViewHostMsg_AccessibilityNotification_Params>& params) {
   for (uint32 index = 0; index < params.size(); index++) {
     const ViewHostMsg_AccessibilityNotification_Params& param = params[index];
 
     switch (param.notification_type) {
-      case ViewHostMsg_AccessibilityNotification_Params::
+      case ViewHostMsg_AccessibilityNotification_Type::
           NOTIFICATION_TYPE_CHECK_STATE_CHANGED:
         OnAccessibilityObjectStateChange(param.acc_obj);
         break;
-      case ViewHostMsg_AccessibilityNotification_Params::
+      case ViewHostMsg_AccessibilityNotification_Type::
           NOTIFICATION_TYPE_CHILDREN_CHANGED:
         OnAccessibilityObjectChildrenChange(param.acc_obj);
         break;
-      case ViewHostMsg_AccessibilityNotification_Params::
+      case ViewHostMsg_AccessibilityNotification_Type::
           NOTIFICATION_TYPE_FOCUS_CHANGED:
         OnAccessibilityObjectFocusChange(param.acc_obj);
         break;
-      case ViewHostMsg_AccessibilityNotification_Params::
+      case ViewHostMsg_AccessibilityNotification_Type::
           NOTIFICATION_TYPE_LOAD_COMPLETE:
         OnAccessibilityObjectLoadComplete(param.acc_obj);
         break;
-      case ViewHostMsg_AccessibilityNotification_Params::
+      case ViewHostMsg_AccessibilityNotification_Type::
           NOTIFICATION_TYPE_VALUE_CHANGED:
         OnAccessibilityObjectValueChange(param.acc_obj);
         break;
-      case ViewHostMsg_AccessibilityNotification_Params::
+      case ViewHostMsg_AccessibilityNotification_Type::
           NOTIFICATION_TYPE_SELECTED_TEXT_CHANGED:
         OnAccessibilityObjectTextChange(param.acc_obj);
         break;
       default:
         DCHECK(0);
         break;
     }
   }
 }
 
 void BrowserAccessibilityManager::OnAccessibilityObjectStateChange(
     const WebAccessibility& acc_obj) {
   BrowserAccessibility* new_browser_acc = UpdateNode(acc_obj, false);
   if (!new_browser_acc)
     return;
 
   NotifyAccessibilityEvent(
-      ViewHostMsg_AccessibilityNotification_Params::
+      ViewHostMsg_AccessibilityNotification_Type::
           NOTIFICATION_TYPE_CHECK_STATE_CHANGED,
       new_browser_acc);
 }
 
 void BrowserAccessibilityManager::OnAccessibilityObjectChildrenChange(
     const WebAccessibility& acc_obj) {
   BrowserAccessibility* new_browser_acc = UpdateNode(acc_obj, true);
   if (!new_browser_acc)
     return;
 
   NotifyAccessibilityEvent(
-      ViewHostMsg_AccessibilityNotification_Params::
+      ViewHostMsg_AccessibilityNotification_Type::
           NOTIFICATION_TYPE_CHILDREN_CHANGED,
       new_browser_acc);
 }
 
 void BrowserAccessibilityManager::OnAccessibilityObjectFocusChange(
   const WebAccessibility& acc_obj) {
   BrowserAccessibility* new_browser_acc = UpdateNode(acc_obj, false);
   if (!new_browser_acc)
     return;
 
   SetFocus(new_browser_acc, false);
   if (delegate_ && delegate_->HasFocus()) {
     GotFocus();
   } else if (!delegate_) {
     // Mac currently does not have a BrowserAccessibilityDelegate.
     NotifyAccessibilityEvent(
-        ViewHostMsg_AccessibilityNotification_Params::
+        ViewHostMsg_AccessibilityNotification_Type::
         NOTIFICATION_TYPE_FOCUS_CHANGED,
         focus_);
   }
 }
 
 void BrowserAccessibilityManager::OnAccessibilityObjectLoadComplete(
   const WebAccessibility& acc_obj) {
   SetFocus(NULL, false);
   root_->InternalReleaseReference(true);
 
   root_ = CreateAccessibilityTree(NULL, acc_obj, 0);
   if (!focus_)
     SetFocus(root_, false);
 
   NotifyAccessibilityEvent(
-      ViewHostMsg_AccessibilityNotification_Params::
+      ViewHostMsg_AccessibilityNotification_Type::
           NOTIFICATION_TYPE_LOAD_COMPLETE,
       root_);
   if (delegate_ && delegate_->HasFocus())
     GotFocus();
 }
 
 void BrowserAccessibilityManager::OnAccessibilityObjectValueChange(
     const WebAccessibility& acc_obj) {
   BrowserAccessibility* new_browser_acc = UpdateNode(acc_obj, false);
   if (!new_browser_acc)
     return;
 
   NotifyAccessibilityEvent(
-      ViewHostMsg_AccessibilityNotification_Params::
+      ViewHostMsg_AccessibilityNotification_Type::
           NOTIFICATION_TYPE_VALUE_CHANGED,
       new_browser_acc);
 }
 
 void BrowserAccessibilityManager::OnAccessibilityObjectTextChange(
     const WebAccessibility& acc_obj) {
   BrowserAccessibility* new_browser_acc = UpdateNode(acc_obj, false);
   if (!new_browser_acc)
     return;
 
   NotifyAccessibilityEvent(
-      ViewHostMsg_AccessibilityNotification_Params::
+      ViewHostMsg_AccessibilityNotification_Type::
           NOTIFICATION_TYPE_SELECTED_TEXT_CHANGED,
       new_browser_acc);
 }
 
 void BrowserAccessibilityManager::GotFocus() {
   // TODO(ctguil): Remove when tree update logic handles focus changes.
   if (!focus_)
     return;
 
   NotifyAccessibilityEvent(
-      ViewHostMsg_AccessibilityNotification_Params::
+      ViewHostMsg_AccessibilityNotification_Type::
           NOTIFICATION_TYPE_FOCUS_CHANGED,
       focus_);
 }
 
 gfx::NativeView BrowserAccessibilityManager::GetParentView() {
   return parent_view_;
 }
 
 BrowserAccessibility* BrowserAccessibilityManager::GetFocus(
     BrowserAccessibility* root) {
@@ skipping 116 matching lines @@
   if ((src.state >> WebAccessibility::STATE_FOCUSED) & 1)
     SetFocus(instance, false);
   for (int i = 0; i < static_cast<int>(src.children.size()); ++i) {
     BrowserAccessibility* child = CreateAccessibilityTree(
         instance, src.children[i], i);
     instance->AddChild(child);
   }
 
   return instance;
 }