Reenable CaptivePortalBrowserTest.TwoBrokenTabs

chrome/browser/captive_portal/captive_portal_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 <map>
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 1584 matching lines @@
   chrome::CloseTab(browser());
 
   // Go through the standard slow load login, and make sure it still works.
   SlowLoadBehindCaptivePortal(browser(), true);
   Login(browser(), 1, 0);
   FailLoadsAfterLogin(browser(), 1);
 }
 
 // Checks that two tabs with SSL timeouts in the same window work.  Both
 // tabs only timeout after logging in.
-// Disabled: http://crbug.com/141497
-#if defined(OS_MACOSX)
-#define MAYBE_TwoBrokenTabs DISABLED_TwoBrokenTabs
-#else
-#define MAYBE_TwoBrokenTabs TwoBrokenTabs
-#endif
-IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, MAYBE_TwoBrokenTabs) {
+IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, TwoBrokenTabs) {
   SlowLoadBehindCaptivePortal(browser(), true);
 
   // Can't set the TabReloader HTTPS timeout on a new tab without doing some
   // acrobatics, so open a new tab at a normal page, and then navigate it to a
   // timeout.
   MultiNavigationObserver navigation_observer;
   CaptivePortalObserver portal_observer(browser()->profile());
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       URLRequestMockHTTPJob::GetMockUrl(
@@ skipping 380 matching lines @@
       base::Bind(&AddHstsHost,
                  make_scoped_refptr(browser()->profile()->GetRequestContext()),
                  http_timeout_url.host()));
 
   SlowLoadBehindCaptivePortal(browser(), true, http_timeout_url);
   Login(browser(), 1, 0);
   FailLoadsAfterLogin(browser(), 1);
 }
 
 }  // namespace captive_portal