Reapplies r55735, fixing some message code that was checked in that I collided with.

chrome/common/render_messages_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/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/render_messages.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webkit/glue/webaccessibility.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebRect.h"
 
 TEST(RenderMessagesUnittest, WebAccessibility) {
   // Test a simple case.
   webkit_glue::WebAccessibility input;
   input.id = 123;
   input.name = ASCIIToUTF16("name");
   input.value = ASCIIToUTF16("value");
   string16 help = ASCIIToUTF16("help");
   input.attributes[webkit_glue::WebAccessibility::ATTR_HELP] = help;
   input.role = webkit_glue::WebAccessibility::ROLE_CHECKBOX;
@@ skipping 63 matching lines @@
   EXPECT_EQ(inner1.name, output.children[0].name);
   EXPECT_EQ(inner1.role, output.children[0].role);
   EXPECT_EQ(inner1.state, output.children[0].state);
   EXPECT_EQ(inner1.location, output.children[0].location);
   EXPECT_EQ(inner2.id, output.children[1].id);
   EXPECT_EQ(inner2.name, output.children[1].name);
   EXPECT_EQ(inner2.role, output.children[1].role);
   EXPECT_EQ(inner2.state, output.children[1].state);
   EXPECT_EQ(inner2.location, output.children[1].location);
 }