Remove the unused close_on_interstitial_webui setting.

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 "components/web_modal/web_contents_modal_dialog_manager.h"
 
 #include <map>
 
 #include "base/memory/scoped_ptr.h"
 #include "components/web_modal/single_web_contents_dialog_manager.h"
@@ skipping 223 matching lines @@
 
   test_api->WebContentsWasShown();
 
   EXPECT_TRUE(manager->IsDialogActive());
   EXPECT_TRUE(delegate->web_contents_blocked());
   EXPECT_EQ(NativeManagerTracker::SHOWN, tracker.state_);
 
   native_manager->StopTracking();
 }
 
-// Test that attaching an interstitial page closes dialogs configured to close.
+// Test that attaching an interstitial page closes all dialogs.
 TEST_F(WebContentsModalDialogManagerTest, InterstitialPage) {
   const NativeWebContentsModalDialog dialog1 = MakeFakeDialog();
   const NativeWebContentsModalDialog dialog2 = MakeFakeDialog();
-  const NativeWebContentsModalDialog dialog3 = MakeFakeDialog();
 
   NativeManagerTracker tracker1;
   NativeManagerTracker tracker2;
-  NativeManagerTracker tracker3;
   TestNativeWebContentsModalDialogManager* native_manager1 =
       new TestNativeWebContentsModalDialogManager(dialog1, manager, &tracker1);
   TestNativeWebContentsModalDialogManager* native_manager2 =
       new TestNativeWebContentsModalDialogManager(dialog2, manager, &tracker2);
-  TestNativeWebContentsModalDialogManager* native_manager3 =
-      new TestNativeWebContentsModalDialogManager(dialog3, manager, &tracker3);
   manager->ShowDialogWithManager(dialog1,
       scoped_ptr<SingleWebContentsDialogManager>(native_manager1).Pass());
   manager->ShowDialogWithManager(dialog2,
       scoped_ptr<SingleWebContentsDialogManager>(native_manager2).Pass());
-  manager->ShowDialogWithManager(dialog3,
-      scoped_ptr<SingleWebContentsDialogManager>(native_manager3).Pass());
-
-#if defined(OS_WIN) || defined(USE_AURA)
-  manager->SetCloseOnInterstitialPage(dialog2, false);
-#else
-  // TODO(wittman): Remove this section once Mac is changed to close on
-  // interstitial pages by default.
-  manager->SetCloseOnInterstitialPage(dialog1, true);
-  manager->SetCloseOnInterstitialPage(dialog3, true);
-#endif
 
   test_api->DidAttachInterstitialPage();
 
+#if defined(USE_AURA)
   EXPECT_EQ(NativeManagerTracker::CLOSED, tracker1.state_);
-  EXPECT_EQ(NativeManagerTracker::SHOWN, tracker2.state_);
-  EXPECT_EQ(NativeManagerTracker::CLOSED, tracker3.state_);
+  EXPECT_EQ(NativeManagerTracker::CLOSED, tracker2.state_);
+#else
+  EXPECT_EQ(NativeManagerTracker::SHOWN, tracker1.state_);
+  EXPECT_EQ(NativeManagerTracker::NOT_SHOWN, tracker2.state_);
+#endif
+
   EXPECT_TRUE(tracker1.was_shown_);
-  EXPECT_TRUE(tracker2.was_shown_);
-  EXPECT_FALSE(tracker3.was_shown_);
+  EXPECT_FALSE(tracker2.was_shown_);
 
   native_manager2->StopTracking();

[Mike Wittman, 2014/05/16 21:37:32]

This should be something like:

#if !defined(USE_AURA)
  native_manager1->StopTracking();
  native_manager2->StopTracking();
#endif

The native managers are deleted when the windows are closed in the USE_AURA
case.

[msw, 2014/05/16 22:38:29]

Done.

 }
 
 
 // Test that the first dialog is always shown, regardless of the order in which
 // dialogs are closed.
 TEST_F(WebContentsModalDialogManagerTest, CloseDialogs) {
   // The front dialog is always shown regardless of dialog close order.
   const NativeWebContentsModalDialog dialog1 = MakeFakeDialog();
   const NativeWebContentsModalDialog dialog2 = MakeFakeDialog();
   const NativeWebContentsModalDialog dialog3 = MakeFakeDialog();
@@ skipping 83 matching lines @@
 
   test_api->CloseAllDialogs();
 
   EXPECT_FALSE(delegate->web_contents_blocked());
   EXPECT_FALSE(manager->IsDialogActive());
   for (int i = 0; i < kWindowCount; i++)
     EXPECT_EQ(NativeManagerTracker::CLOSED, trackers[i].state_);
 }
 
 }  // namespace web_modal