Refactor modality-specific behavior from ConstrainedWindowViews to WebContentsModalDialogManager

chrome/browser/ui/web_contents_modal_dialog_manager_unittest.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/web_contents_modal_dialog.h"
 #include "chrome/browser/ui/web_contents_modal_dialog_manager.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 34 matching lines @@
   virtual gfx::NativeWindow GetNativeWindow() {
     NOTREACHED();
     return NULL;
   }
   virtual ~WebContentsModalDialogCloseTest() {}
 
   int close_count;
   content::WebContents* web_contents_;
 };
 
-TEST_F(WebContentsModalDialogManagerTest, ConstrainedWindows) {
+TEST_F(WebContentsModalDialogManagerTest, WebContentsModalDialogs) {
   WebContentsModalDialogCloseTest window(web_contents());
   window.close_count = 0;
   WebContentsModalDialogManager* web_contents_modal_dialog_manager =
       WebContentsModalDialogManager::FromWebContents(web_contents());
+  WebContentsModalDialogManager::TestApi test_api(
+      web_contents_modal_dialog_manager);
+
+  test_api.ResetUIDelegate(NULL);
 
   const int kWindowCount = 4;
   for (int i = 0; i < kWindowCount; i++)
     web_contents_modal_dialog_manager->AddDialog(&window);
   EXPECT_EQ(window.close_count, 0);
 
-  WebContentsModalDialogManager::TestApi test_api(
-      web_contents_modal_dialog_manager);
   test_api.CloseAllDialogs();
   EXPECT_EQ(window.close_count, kWindowCount);
 }