Reland Fix Views web-modal dialog widget creation.

chrome/browser/ui/views/constrained_window_views_browsertest.cc

Index: chrome/browser/ui/views/constrained_window_views_browsertest.cc
diff --git a/chrome/browser/ui/views/constrained_window_views_browsertest.cc b/chrome/browser/ui/views/constrained_window_views_browsertest.cc
index 5f5ac696913dd222b8ec4839df988a9a4f4f1235..9b1bfd8328d8ad3c58b4c441325bccd8207f6652 100644
--- a/chrome/browser/ui/views/constrained_window_views_browsertest.cc
+++ b/chrome/browser/ui/views/constrained_window_views_browsertest.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/browser/ui/views/constrained_window_views.h"
+
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ -51,10 +53,7 @@ class TestDialog : public views::DialogDelegateView {
 // A helper function to create and show a web contents modal dialog.
 scoped_ptr<TestDialog> ShowModalDialog(content::WebContents* web_contents) {
   scoped_ptr<TestDialog> dialog(new TestDialog());
-  views::Widget* window = views::Widget::CreateWindowAsFramelessChild(
-      dialog.get(), web_contents->GetNativeView());
-  web_modal::WebContentsModalDialogManager::FromWebContents(web_contents)->
-      ShowModalDialog(window->GetNativeView());
+  ShowWebModalDialogViews(dialog.get(), web_contents);
   return dialog.Pass();
 }