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

chrome/browser/accessibility/browser_accessibility_manager_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 "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/accessibility/browser_accessibility.h"
 #include "chrome/browser/accessibility/browser_accessibility_manager.h"
-#include "chrome/common/render_messages_params.h"
+#include "content/common/view_messages.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/webaccessibility.h"
 
 using webkit_glue::WebAccessibility;
 
 namespace {
 
 // Subclass of BrowserAccessibility that counts the number of instances.
 class CountedBrowserAccessibility : public BrowserAccessibility {
  public:
@@ skipping 203 matching lines @@
 
   // Check the index in parent.
   EXPECT_EQ(0, child1_accessible->index_in_parent());
   EXPECT_EQ(1, child2_accessible->index_in_parent());
   EXPECT_EQ(2, child3_accessible->index_in_parent());
 
   // Process a notification containing the changed subtree.
   std::vector<ViewHostMsg_AccessibilityNotification_Params> params;
   params.push_back(ViewHostMsg_AccessibilityNotification_Params());
   ViewHostMsg_AccessibilityNotification_Params* msg = &params[0];
-  msg->notification_type = ViewHostMsg_AccessibilityNotification_Params::
+  msg->notification_type = ViewHostMsg_AccessibilityNotification_Type::
       NOTIFICATION_TYPE_CHILDREN_CHANGED;
   msg->acc_obj = tree2_root;
   manager->OnAccessibilityNotifications(params);
 
   // There should be 5 objects now: the 4 from the new tree, plus the
   // reference to child3 we kept.
   EXPECT_EQ(5, CountedBrowserAccessibility::global_obj_count_);
 
   // Check that our references to the root, child1, and child2 are still valid,
   // but that the reference to child3 is now invalid.
@@ skipping 184 matching lines @@
 
   // Check the index in parent.
   EXPECT_EQ(1, child2_accessible->index_in_parent());
   EXPECT_EQ(2, child3_accessible->index_in_parent());
 
   // Process a notification containing the changed subtree rooted at
   // the container.
   std::vector<ViewHostMsg_AccessibilityNotification_Params> params;
   params.push_back(ViewHostMsg_AccessibilityNotification_Params());
   ViewHostMsg_AccessibilityNotification_Params* msg = &params[0];
-  msg->notification_type = ViewHostMsg_AccessibilityNotification_Params::
+  msg->notification_type = ViewHostMsg_AccessibilityNotification_Type::
       NOTIFICATION_TYPE_CHILDREN_CHANGED;
   msg->acc_obj = tree2_container;
   manager->OnAccessibilityNotifications(params);
 
   // There should be 9 objects now: the 8 from the new tree, plus the
   // reference to child3 we kept.
   EXPECT_EQ(9, CountedBrowserAccessibility::global_obj_count_);
 
   // Check that our references to the root and container and child2 are
   // still valid, but that the reference to child3 is now invalid.
@@ skipping 79 matching lines @@
           NULL,
           tree1_1,
           NULL,
           new CountedBrowserAccessibilityFactory());
   ASSERT_EQ(4, CountedBrowserAccessibility::global_obj_count_);
 
   // Process a notification containing the changed subtree.
   std::vector<ViewHostMsg_AccessibilityNotification_Params> params;
   params.push_back(ViewHostMsg_AccessibilityNotification_Params());
   ViewHostMsg_AccessibilityNotification_Params* msg = &params[0];
-  msg->notification_type = ViewHostMsg_AccessibilityNotification_Params::
+  msg->notification_type = ViewHostMsg_AccessibilityNotification_Type::
       NOTIFICATION_TYPE_CHILDREN_CHANGED;
   msg->acc_obj = tree2_1;
   manager->OnAccessibilityNotifications(params);
 
   // There should be 4 objects now.
   EXPECT_EQ(4, CountedBrowserAccessibility::global_obj_count_);
 
   // Delete the manager and make sure all memory is cleaned up.
   delete manager;
   ASSERT_EQ(0, CountedBrowserAccessibility::global_obj_count_);
 }