Get rid of temporary render_view_host.h.

chrome/browser/accessibility/accessibility_win_browsertest.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 <atlbase.h>
 #include <vector>
 
 #include "base/scoped_comptr_win.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/browser_window.h"
-#include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_widget_host_view_win.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
+#include "content/browser/renderer_host/render_view_host.h"
+#include "content/browser/tab_contents/tab_contents.h"
 #include "ia2_api_all.h"  // Generated    NOLINT
 #include "ISimpleDOMNode.h"  // Generated   NOLINT
 
 using std::auto_ptr;
 using std::vector;
 using std::wstring;
 
 namespace {
 
 class AccessibilityWinBrowserTest : public InProcessBrowserTest {
@@ skipping 673 matching lines @@
   ASSERT_EQ(S_OK, hr);
   hr = checkbox_isimpledomnode->get_nodeInfo(
       &node_name, &name_space_id, &node_value, &num_children, &unique_id,
       &node_type);
   ASSERT_EQ(S_OK, hr);
   EXPECT_STREQ(L"input", wstring(node_name, SysStringLen(node_name)).c_str());
   EXPECT_EQ(NODETYPE_ELEMENT, node_type);
   EXPECT_EQ(0, num_children);
 }
 }  // namespace.