Move external popup menus from WebViewClient to WebFrameClient, part 3/3.

content/renderer/external_popup_menu_browsertest.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 "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/render_frame_impl.h"
 #include "content/renderer/render_view_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 
 // Tests for the external select popup menu (Mac specific).
 
 namespace content {
 namespace {
 
 const char* const kSelectID = "mySelect";
 const char* const kEmptySelectID = "myEmptySelect";
 
 }  // namespace
 
 class ExternalPopupMenuTest : public RenderViewTest {
  public:
   ExternalPopupMenuTest() {}
 
   RenderViewImpl* view() {
     return static_cast<RenderViewImpl*>(view_);
   }
 
+  RenderFrameImpl* frame() {
+    return view()->main_render_frame();
+  }
+
   virtual void SetUp() {
     RenderViewTest::SetUp();
     // We need to set this explictly as RenderMain is not run.
     blink::WebView::setUseExternalPopupMenus(true);
 
     std::string html = "<select id='mySelect' onchange='selectChanged(this)'>"
                        "  <option>zero</option>"
                        "  <option selected='1'>one</option>"
                        "  <option>two</option>"
                        "</select>"
@@ skipping 31 matching lines @@
 
 // Normal case: test showing a select popup, canceling/selecting an item.
 TEST_F(ExternalPopupMenuTest, NormalCase) {
   IPC::TestSink& sink = render_thread_->sink();
 
   // Click the text field once.
   EXPECT_TRUE(SimulateElementClick(kSelectID));
 
   // We should have sent a message to the browser to show the popup menu.
   const IPC::Message* message =
-      sink.GetUniqueMessageMatching(ViewHostMsg_ShowPopup::ID);
+      sink.GetUniqueMessageMatching(FrameHostMsg_ShowPopup::ID);
   ASSERT_TRUE(message != NULL);
-  Tuple1<ViewHostMsg_ShowPopup_Params> param;
-  ViewHostMsg_ShowPopup::Read(message, &param);
+  Tuple1<FrameHostMsg_ShowPopup_Params> param;
+  FrameHostMsg_ShowPopup::Read(message, &param);
   ASSERT_EQ(3U, param.a.popup_items.size());
   EXPECT_EQ(1, param.a.selected_item);
 
-  // Simulate the user canceling the popup, the index should not have changed.
-  view()->OnSelectPopupMenuItem(-1);
+  // Simulate the user canceling the popup; the index should not have changed.
+  frame()->OnSelectPopupMenuItem(-1);
   EXPECT_EQ(1, GetSelectedIndex());
 
   // Show the pop-up again and this time make a selection.
   EXPECT_TRUE(SimulateElementClick(kSelectID));
-  view()->OnSelectPopupMenuItem(0);
+  frame()->OnSelectPopupMenuItem(0);
   EXPECT_EQ(0, GetSelectedIndex());
 
   // Show the pop-up again and make another selection.
   sink.ClearMessages();
   EXPECT_TRUE(SimulateElementClick(kSelectID));
-  message = sink.GetUniqueMessageMatching(ViewHostMsg_ShowPopup::ID);
+  message = sink.GetUniqueMessageMatching(FrameHostMsg_ShowPopup::ID);
   ASSERT_TRUE(message != NULL);
-  ViewHostMsg_ShowPopup::Read(message, &param);
+  FrameHostMsg_ShowPopup::Read(message, &param);
   ASSERT_EQ(3U, param.a.popup_items.size());
   EXPECT_EQ(0, param.a.selected_item);
 }
 
 // Page shows popup, then navigates away while popup showing, then select.
 TEST_F(ExternalPopupMenuTest, ShowPopupThenNavigate) {
   // Click the text field once.
   EXPECT_TRUE(SimulateElementClick(kSelectID));
 
   // Now we navigate to another pager.
   LoadHTML("<blink>Awesome page!</blink>");
 
   // Now the user selects something, we should not crash.
-  view()->OnSelectPopupMenuItem(-1);
+  frame()->OnSelectPopupMenuItem(-1);
 }
 
 // An empty select should not cause a crash when clicked.
 // http://crbug.com/63774
 TEST_F(ExternalPopupMenuTest, EmptySelect) {
   EXPECT_TRUE(SimulateElementClick(kEmptySelectID));
 }
 
 class ExternalPopupMenuRemoveTest : public ExternalPopupMenuTest {
  public:
   ExternalPopupMenuRemoveTest() {}
 
  protected:
   virtual bool ShouldRemoveSelectOnChange() const OVERRIDE { return true; }
 };
 
 // Tests that nothing bad happen when the page removes the select when it
 // changes. (http://crbug.com/61997)
 TEST_F(ExternalPopupMenuRemoveTest, RemoveOnChange) {
   // Click the text field once to show the popup.
   EXPECT_TRUE(SimulateElementClick(kSelectID));
 
   // Select something, it causes the select to be removed from the page.
-  view()->OnSelectPopupMenuItem(0);
+  frame()->OnSelectPopupMenuItem(0);
 
   // Just to check the soundness of the test, call SimulateElementClick again.
   // It should return false as the select has been removed.
   EXPECT_FALSE(SimulateElementClick(kSelectID));
 }
 
 class ExternalPopupMenuDisplayNoneTest : public ExternalPopupMenuTest {
   public:
   ExternalPopupMenuDisplayNoneTest() {}
 
@@ skipping 21 matching lines @@
   }
 
 };
 
 TEST_F(ExternalPopupMenuDisplayNoneTest, SelectItem) {
   // Click the text field once to show the popup.
   EXPECT_TRUE(SimulateElementClick(kSelectID));
 
   // Select index 1 item. This should select item with index 2,
   // skipping the item with 'display: none'
-  view()->OnSelectPopupMenuItem(1);
+  frame()->OnSelectPopupMenuItem(1);
 
-  EXPECT_EQ(2,GetSelectedIndex());
+  EXPECT_EQ(2, GetSelectedIndex());
 }
 
 }  // namespace content