Revert 253010 "Revert 251563 "Move browser initiated navigation ..."

trunk/src/content/renderer/accessibility/renderer_accessibility_browsertest.cc

 // Copyright (c) 2012 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/strings/utf_string_conversions.h"
-#include "content/common/view_messages.h"
+#include "content/common/frame_messages.h"
 #include "content/public/test/render_view_test.h"
 #include "content/renderer/accessibility/renderer_accessibility_complete.h"
 #include "content/renderer/render_view_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/web/WebAXObject.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "ui/accessibility/ax_node_data.h"
 
@@ skipping 38 matching lines @@
 };
 
 class RendererAccessibilityTest : public RenderViewTest {
  public:
   RendererAccessibilityTest() {}
 
   RenderViewImpl* view() {
     return static_cast<RenderViewImpl*>(view_);
   }
 
+  RenderFrameImpl* frame() {
+    return static_cast<RenderFrameImpl*>(view()->GetMainRenderFrame());
+  }
+
   virtual void SetUp() {
     RenderViewTest::SetUp();
     sink_ = &render_thread_->sink();
   }
 
   void SetMode(unsigned int mode) {
     view()->OnSetAccessibilityMode(mode);
   }
 
   void GetLastAccEvent(
@@ skipping 10 matching lines @@
   int CountAccessibilityNodesSentToBrowser() {
     AccessibilityHostMsg_EventParams event;
     GetLastAccEvent(&event);
     return event.nodes.size();
   }
 
  protected:
   IPC::TestSink* sink_;
 
   DISALLOW_COPY_AND_ASSIGN(RendererAccessibilityTest);
+
 };
 
 TEST_F(RendererAccessibilityTest, EditableTextModeFocusEvents) {
   // This is not a test of true web accessibility, it's a test of
   // a mode used on Windows 8 in Metro mode where an extremely simplified
   // accessibility tree containing only the current focused node is
   // generated.
   SetMode(AccessibilityModeEditableTextOnly);
 
   // Set a minimum size and give focus so simulated events work.
@@ skipping 242 matching lines @@
   view()->OnSwapOut();
   accessibility->SendPendingAccessibilityEvents();
   EXPECT_FALSE(sink_->GetUniqueMessageMatching(
       AccessibilityHostMsg_Events::ID));
 
   // Navigate, so we're not swapped out anymore. Now we should
   // send accessibility events again. Note that the
   // message that was queued up before will be quickly discarded
   // because the element it was referring to no longer exists,
   // so the event here is from loading this new page.
-  ViewMsg_Navigate_Params nav_params;
+  FrameMsg_Navigate_Params nav_params;
   nav_params.url = GURL("data:text/html,<p>Hello, again.</p>");
-  nav_params.navigation_type = ViewMsg_Navigate_Type::NORMAL;
+  nav_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
   nav_params.transition = PAGE_TRANSITION_TYPED;
   nav_params.current_history_list_length = 1;
   nav_params.current_history_list_offset = 0;
   nav_params.pending_history_list_offset = 1;
   nav_params.page_id = -1;
-  view()->OnNavigate(nav_params);
+  frame()->OnNavigate(nav_params);
   accessibility->SendPendingAccessibilityEvents();
   EXPECT_TRUE(sink_->GetUniqueMessageMatching(
       AccessibilityHostMsg_Events::ID));
 }
 
 TEST_F(RendererAccessibilityTest, HideAccessibilityObject) {
   // Test RendererAccessibilityComplete and make sure it sends the
   // proper event to the browser when an object in the tree
   // is hidden, but its children are not.
   std::string html =
@@ skipping 156 matching lines @@
   GetLastAccEvent(&event);
   ASSERT_EQ(5U, event.nodes.size());
 
   EXPECT_EQ(body.axID(), event.nodes[0].id);
   EXPECT_EQ(text_1.axID(), event.nodes[1].id);
   // The third event is to update text_2, but its id changes
   // so we don't have a test expectation for it.
 }
 
 }  // namespace content