Convert more users away from DOMView.

chrome/browser/ui/views/html_dialog_view_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/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_path.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
@@ skipping 96 matching lines @@
   test::TestHtmlDialogUIDelegate* delegate = new test::TestHtmlDialogUIDelegate(
       GURL(chrome::kChromeUIChromeURLsURL));
   delegate->set_size(kInitialWidth, kInitialHeight);
 
   TestHtmlDialogView* html_view =
       new TestHtmlDialogView(browser()->profile(), browser(), delegate);
   WebContents* web_contents = browser()->GetSelectedWebContents();
   ASSERT_TRUE(web_contents != NULL);
   views::Widget::CreateWindowWithParent(
       html_view, web_contents->GetView()->GetTopLevelNativeWindow());
-  html_view->InitDialog();
   html_view->GetWidget()->Show();
 
   // TestHtmlDialogView should quit current message loop on size change.
   html_view->set_should_quit_on_size_change(true);
 
   gfx::Rect bounds = html_view->GetWidget()->GetClientAreaScreenBounds();
 
   gfx::Rect set_bounds = bounds;
   gfx::Rect actual_bounds, rwhv_bounds;
 
   // Bigger than the default in both dimensions.
   set_bounds.set_width(400);
   set_bounds.set_height(300);
 
   html_view->MoveContents(web_contents, set_bounds);
   ui_test_utils::RunMessageLoop();  // TestHtmlDialogView will quit.
   actual_bounds = html_view->GetWidget()->GetClientAreaScreenBounds();
   EXPECT_EQ(set_bounds, actual_bounds);
 
-  rwhv_bounds = html_view->dom_contents()->web_contents()->
-      GetRenderWidgetHostView()->GetViewBounds();
+  rwhv_bounds =
+      html_view->web_contents()->GetRenderWidgetHostView()->GetViewBounds();
   EXPECT_LT(0, rwhv_bounds.width());
   EXPECT_LT(0, rwhv_bounds.height());
   EXPECT_GE(set_bounds.width(), rwhv_bounds.width());
   EXPECT_GE(set_bounds.height(), rwhv_bounds.height());
 
   // Larger in one dimension and smaller in the other.
   set_bounds.set_width(550);
   set_bounds.set_height(250);
 
   html_view->MoveContents(web_contents, set_bounds);
   ui_test_utils::RunMessageLoop();  // TestHtmlDialogView will quit.
   actual_bounds = html_view->GetWidget()->GetClientAreaScreenBounds();
   EXPECT_EQ(set_bounds, actual_bounds);
 
-  rwhv_bounds = html_view->dom_contents()->web_contents()->
-      GetRenderWidgetHostView()->GetViewBounds();
+  rwhv_bounds =
+      html_view->web_contents()->GetRenderWidgetHostView()->GetViewBounds();
   EXPECT_LT(0, rwhv_bounds.width());
   EXPECT_LT(0, rwhv_bounds.height());
   EXPECT_GE(set_bounds.width(), rwhv_bounds.width());
   EXPECT_GE(set_bounds.height(), rwhv_bounds.height());
 
   // Get very small.
   gfx::Size min_size = html_view->GetWidget()->GetMinimumSize();
   set_bounds.set_size(min_size);
 
   html_view->MoveContents(web_contents, set_bounds);
   ui_test_utils::RunMessageLoop();  // TestHtmlDialogView will quit.
   actual_bounds = html_view->GetWidget()->GetClientAreaScreenBounds();
   EXPECT_EQ(set_bounds, actual_bounds);
 
-  rwhv_bounds = html_view->dom_contents()->web_contents()->
-      GetRenderWidgetHostView()->GetViewBounds();
+  rwhv_bounds =
+      html_view->web_contents()->GetRenderWidgetHostView()->GetViewBounds();
   EXPECT_LT(0, rwhv_bounds.width());
   EXPECT_LT(0, rwhv_bounds.height());
   EXPECT_GE(set_bounds.width(), rwhv_bounds.width());
   EXPECT_GE(set_bounds.height(), rwhv_bounds.height());
 
   // Check to make sure we can't get to 0x0
   set_bounds.set_width(0);
   set_bounds.set_height(0);
 
   html_view->MoveContents(web_contents, set_bounds);
@@ skipping 19 matching lines @@
   html_view->InitDialog();
   html_view->GetWidget()->Show();
 
   // TestHtmlDialogView::OnTabMainFrameRender() will Quit().
   MessageLoopForUI::current()->Run();
 
   EXPECT_TRUE(html_view->painted());
 
   html_view->GetWidget()->Close();
 }