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

Side by Side Diff: chrome_frame/test/navigation_test.cc

Issue 11664013: GTTF: No more FLAKY_ . (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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
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 <string> 5 #include <string>
6 6
7 #include "base/test/test_file_util.h" 7 #include "base/test/test_file_util.h"
8 #include "base/win/scoped_comptr.h" 8 #include "base/win/scoped_comptr.h"
9 #include "base/win/windows_version.h" 9 #include "base/win/windows_version.h"
10 #include "chrome_frame/test/chrome_frame_test_utils.h" 10 #include "chrome_frame/test/chrome_frame_test_utils.h"
(...skipping 582 matching lines...) Expand 10 before | Expand all | Expand 10 after
593 EXPECT_CALL(ie_mock_, OnLoad(IN_IE, StrEq(url))) 593 EXPECT_CALL(ie_mock_, OnLoad(IN_IE, StrEq(url)))
594 .WillOnce(CloseBrowserMock(&ie_mock_)); 594 .WillOnce(CloseBrowserMock(&ie_mock_));
595 595
596 LaunchIEAndNavigate(url); 596 LaunchIEAndNavigate(url);
597 } 597 }
598 598
599 }; 599 };
600 600
601 // Test navigation to a disallowed gcf: url with file scheme. 601 // Test navigation to a disallowed gcf: url with file scheme.
602 // Times out sporadically; http://crbug.com/119718. 602 // Times out sporadically; http://crbug.com/119718.
603 TEST_F(NavigationTest, FLAKY_GcfProtocol1) { 603 TEST_F(NavigationTest, DISABLED_GcfProtocol1) {
604 // Make sure that we are not accidently enabling gcf protocol. 604 // Make sure that we are not accidently enabling gcf protocol.
605 SetConfigBool(kAllowUnsafeURLs, false); 605 SetConfigBool(kAllowUnsafeURLs, false);
606 TestDisAllowedUrl(L"gcf:file:///C:/"); 606 TestDisAllowedUrl(L"gcf:file:///C:/");
607 } 607 }
608 608
609 // Test navigation to a disallowed gcf: url with http scheme. 609 // Test navigation to a disallowed gcf: url with http scheme.
610 TEST_F(NavigationTest, GcfProtocol2) { 610 TEST_F(NavigationTest, GcfProtocol2) {
611 // Make sure that we are not accidently enabling gcf protocol. 611 // Make sure that we are not accidently enabling gcf protocol.
612 SetConfigBool(kAllowUnsafeURLs, false); 612 SetConfigBool(kAllowUnsafeURLs, false);
613 TestDisAllowedUrl(L"gcf:http://www.google.com"); 613 TestDisAllowedUrl(L"gcf:http://www.google.com");
(...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after
1281 .WillOnce(CloseBrowserMock( 1281 .WillOnce(CloseBrowserMock(
1282 &no_referrer_target_opener_window_mock)); 1282 &no_referrer_target_opener_window_mock));
1283 1283
1284 EXPECT_CALL(no_referrer_target_opener_window_mock, OnQuit()) 1284 EXPECT_CALL(no_referrer_target_opener_window_mock, OnQuit())
1285 .WillOnce(CloseBrowserMock(&ie_mock_)); 1285 .WillOnce(CloseBrowserMock(&ie_mock_));
1286 1286
1287 LaunchIENavigateAndLoop(initial_url, kChromeFrameVeryLongNavigationTimeout); 1287 LaunchIENavigateAndLoop(initial_url, kChromeFrameVeryLongNavigationTimeout);
1288 } 1288 }
1289 1289
1290 } // namespace chrome_frame_test 1290 } // namespace chrome_frame_test
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698