Provide configurable closing of web contents modal dialogs on interstitial webui

components/web_modal/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 <map>
 
 #include "base/memory/scoped_ptr.h"
 #include "components/web_modal/native_web_contents_modal_dialog_manager.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
@@ skipping 214 matching lines @@
   manager->Observe(content::NOTIFICATION_WEB_CONTENTS_VISIBILITY_CHANGED,
                    content::NotificationService::AllSources(),
                    content::Details<bool>(&web_contents_visible));
 
   EXPECT_TRUE(manager->IsShowingDialog());
   EXPECT_TRUE(delegate->web_contents_blocked());
   EXPECT_EQ(TestNativeWebContentsModalDialogManager::SHOWN,
             native_manager->GetDialogState(dialog1));
 }
 
+TEST_F(WebContentsModalDialogManagerTest, InterstitialWebUI) {

[sky, 2013/09/05 16:19:19]

Add description.

[Mike Wittman, 2013/09/05 20:22:19]

Done.

+  const NativeWebContentsModalDialog dialog1 = MakeFakeDialog(1);
+  const NativeWebContentsModalDialog dialog2 = MakeFakeDialog(2);
+  const NativeWebContentsModalDialog dialog3 = MakeFakeDialog(3);
+
+  manager->ShowDialog(dialog1);
+  manager->ShowDialog(dialog2);
+  manager->ShowDialog(dialog3);
+
+  manager->SetCloseOnInterstitialWebUI(dialog1, true);
+  manager->SetCloseOnInterstitialWebUI(dialog3, true);
+
+  test_api->DidAttachInterstitialPage();
+  EXPECT_EQ(TestNativeWebContentsModalDialogManager::CLOSED,
+            native_manager->GetDialogState(dialog1));
+  EXPECT_EQ(TestNativeWebContentsModalDialogManager::SHOWN,
+            native_manager->GetDialogState(dialog2));
+  EXPECT_EQ(TestNativeWebContentsModalDialogManager::CLOSED,
+            native_manager->GetDialogState(dialog3));
+}
+
 TEST_F(WebContentsModalDialogManagerTest, CloseDialogs) {
   // The front dialog is always shown regardless of dialog close order.
   const NativeWebContentsModalDialog dialog1 = MakeFakeDialog(1);
   const NativeWebContentsModalDialog dialog2 = MakeFakeDialog(2);
   const NativeWebContentsModalDialog dialog3 = MakeFakeDialog(3);
   const NativeWebContentsModalDialog dialog4 = MakeFakeDialog(4);
 
   manager->ShowDialog(dialog1);
   manager->ShowDialog(dialog2);
   manager->ShowDialog(dialog3);
@@ skipping 47 matching lines @@
 
   EXPECT_EQ(0, native_manager->GetCloseCount());
 
   test_api->CloseAllDialogs();
   EXPECT_FALSE(delegate->web_contents_blocked());
   EXPECT_FALSE(manager->IsShowingDialog());
   EXPECT_EQ(kWindowCount, native_manager->GetCloseCount());
 }
 
 }  // namespace web_modal