Revert of Separate RenderView from RenderWidget, part 1: inheritance.

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/macros.h"
 #include "base/strings/utf_string_conversions.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"
@@ skipping 40 matching lines @@
               "  function selectChanged(select) {"
               "    select.parentNode.removeChild(select);"
               "  }"
               "</script>";
     }
 
     // Load the test page.
     LoadHTML(html.c_str());
 
     // Set a minimum size and give focus so simulated events work.
-    view()->GetWidget()->webwidget()->resize(blink::WebSize(500, 500));
-    view()->GetWidget()->webwidget()->setFocus(true);
+    view()->webwidget()->resize(blink::WebSize(500, 500));
+    view()->webwidget()->setFocus(true);
   }
 
   int GetSelectedIndex() {
     base::string16 script(base::ASCIIToUTF16(kSelectID));
     script.append(base::ASCIIToUTF16(".selectedIndex"));
     int selected_index = -1;
     ExecuteJavaScriptAndReturnIntValue(script, &selected_index);
     return selected_index;
   }
 
@@ skipping 94 matching lines @@
                        "  </optgroup>"
                        "  <option value='two'>two</option>"
                        "  <option value='three'>three</option>"
                        "  <option value='four'>four</option>"
                        "  <option value='five'>five</option>"
                        "</select>";
     // Load the test page.
     LoadHTML(html.c_str());
 
     // Set a minimum size and give focus so simulated events work.
-    view()->GetWidget()->webwidget()->resize(blink::WebSize(500, 500));
-    view()->GetWidget()->webwidget()->setFocus(true);
+    view()->webwidget()->resize(blink::WebSize(500, 500));
+    view()->webwidget()->setFocus(true);
   }
 
 };
 
 TEST_F(ExternalPopupMenuDisplayNoneTest, SelectItem) {
   IPC::TestSink& sink = render_thread_->sink();
 
   // Click the text field once to show the popup.
   EXPECT_TRUE(SimulateElementClick(kSelectID));
 
   // Read the message sent to browser to show the popup menu.
   const IPC::Message* message =
       sink.GetUniqueMessageMatching(FrameHostMsg_ShowPopup::ID);
   ASSERT_TRUE(message != NULL);
   base::Tuple<FrameHostMsg_ShowPopup_Params> param;
   FrameHostMsg_ShowPopup::Read(message, &param);
   // Number of items should match item count minus the number
   // of "display: none" items.
   ASSERT_EQ(5U, base::get<0>(param).popup_items.size());
 
   // Select index 1 item. This should select item with index 2,
   // skipping the item with 'display: none'
   frame()->OnSelectPopupMenuItem(1);
 
   EXPECT_EQ(2, GetSelectedIndex());
 }
 
 }  // namespace content