Reland Fix Views web-modal dialog widget creation.

chrome/browser/ui/views/constrained_window_views_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 "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"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/views/tab_modal_confirm_dialog_views.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ skipping 29 matching lines @@
 #endif
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestDialog);
 };
 
 // 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();
 }
 
 } // namespace
 
 typedef InProcessBrowserTest ConstrainedWindowViewTest;
 
 // Tests the intial focus of tab-modal dialogs, the restoration of focus to the
 // browser when they close, and that queued dialogs don't register themselves as
 // accelerator targets until they are displayed.
@@ skipping 140 matching lines @@
 #endif
 
   scoped_ptr<TestDialog> dialog = ShowModalDialog(
       browser()->tab_strip_model()->GetActiveWebContents());
   EXPECT_TRUE(dialog->GetWidget()->IsVisible());
   EXPECT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_ESCAPE,
                                               false, false, false, false));
   content::RunAllPendingInMessageLoop();
   EXPECT_EQ(NULL, dialog->GetWidget());
 }