Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(290)

Side by Side Diff: chrome/browser/notifications/notification_browsertest.cc

Issue 11821021: Disable NotificationsTest.TestCrashTabWithPermissionInfobar on Windows and Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <deque> 5 #include <deque>
6 #include <string> 6 #include <string>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 653 matching lines...) Expand 10 before | Expand all | Expand 10 after
664 GetPrefsByContentSetting(CONTENT_SETTING_ALLOW, &settings); 664 GetPrefsByContentSetting(CONTENT_SETTING_ALLOW, &settings);
665 EXPECT_EQ(0U, settings.size()); 665 EXPECT_EQ(0U, settings.size());
666 } 666 }
667 667
668 IN_PROC_BROWSER_TEST_F(NotificationsTest, TestExitBrowserWithInfobar) { 668 IN_PROC_BROWSER_TEST_F(NotificationsTest, TestExitBrowserWithInfobar) {
669 // Exit the browser window, when the infobar appears. 669 // Exit the browser window, when the infobar appears.
670 ui_test_utils::NavigateToURL(browser(), test_page_url_); 670 ui_test_utils::NavigateToURL(browser(), test_page_url_);
671 ASSERT_TRUE(RequestPermissionAndWait(browser())); 671 ASSERT_TRUE(RequestPermissionAndWait(browser()));
672 } 672 }
673 673
674 IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCrashTabWithPermissionInfobar) { 674 // Times out on Windows and Linux. http://crbug.com/168976
675 #if defined(OS_WIN) || defined(OS_LINUX)
676 #define MAYBE_TestCrashTabWithPermissionInfobar \
677 DISABLED_TestCrashTabWithPermissionInfobar
678 #else
679 #define MAYBE_TestCrashTabWithPermissionInfobar \
680 TestCrashTabWithPermissionInfobar
681 #endif
682 IN_PROC_BROWSER_TEST_F(NotificationsTest,
683 MAYBE_TestCrashTabWithPermissionInfobar) {
675 // Test crashing the tab with permission infobar doesn't crash Chrome. 684 // Test crashing the tab with permission infobar doesn't crash Chrome.
676 ui_test_utils::NavigateToURLWithDisposition( 685 ui_test_utils::NavigateToURLWithDisposition(
677 browser(), 686 browser(),
678 empty_page_url_, 687 empty_page_url_,
679 NEW_BACKGROUND_TAB, 688 NEW_BACKGROUND_TAB,
680 ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB); 689 ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
681 browser()->tab_strip_model()->ActivateTabAt(0, true); 690 browser()->tab_strip_model()->ActivateTabAt(0, true);
682 ui_test_utils::NavigateToURL(browser(), test_page_url_); 691 ui_test_utils::NavigateToURL(browser(), test_page_url_);
683 ASSERT_TRUE(RequestPermissionAndWait(browser())); 692 ASSERT_TRUE(RequestPermissionAndWait(browser()));
684 CrashTab(browser(), 0); 693 CrashTab(browser(), 0);
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
781 const std::deque<Balloon*>& balloons = GetActiveBalloons(); 790 const std::deque<Balloon*>& balloons = GetActiveBalloons();
782 EXPECT_EQ(1U, balloons.size()); 791 EXPECT_EQ(1U, balloons.size());
783 const Notification& notification = balloons[0]->notification(); 792 const Notification& notification = balloons[0]->notification();
784 GURL EXPECTED_ICON_URL = test_server()->GetURL(kExpectedIconUrl); 793 GURL EXPECTED_ICON_URL = test_server()->GetURL(kExpectedIconUrl);
785 EXPECT_EQ(EXPECTED_ICON_URL, notification.icon_url()); 794 EXPECT_EQ(EXPECTED_ICON_URL, notification.icon_url());
786 EXPECT_EQ(ASCIIToUTF16("Title2"), notification.title()); 795 EXPECT_EQ(ASCIIToUTF16("Title2"), notification.title());
787 EXPECT_EQ(ASCIIToUTF16("Body2"), notification.body()); 796 EXPECT_EQ(ASCIIToUTF16("Body2"), notification.body());
788 } 797 }
789 798
790 #endif // !defined(OS_CHROMEOS) 799 #endif // !defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698