| OLD | NEW |
| 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "build/build_config.h" | 6 #include "build/build_config.h" |
| 7 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" | 7 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/ui/browser_commands.h" | 10 #include "chrome/browser/ui/browser_commands.h" |
| (...skipping 685 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 696 | 696 |
| 697 // Tests ToggleFullscreenModeForTab always causes window to change. | 697 // Tests ToggleFullscreenModeForTab always causes window to change. |
| 698 // Test is flaky: http://crbug.com/146006 | 698 // Test is flaky: http://crbug.com/146006 |
| 699 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, | 699 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, |
| 700 DISABLED_ToggleFullscreenModeForTab) { | 700 DISABLED_ToggleFullscreenModeForTab) { |
| 701 // Most fullscreen tests run sharded in fullscreen_controller_browsertest.cc | 701 // Most fullscreen tests run sharded in fullscreen_controller_browsertest.cc |
| 702 // but flakiness required a while loop in | 702 // but flakiness required a while loop in |
| 703 // FullscreenControllerTest::ToggleTabFullscreen. This test verifies that | 703 // FullscreenControllerTest::ToggleTabFullscreen. This test verifies that |
| 704 // when running serially there is no flakiness. | 704 // when running serially there is no flakiness. |
| 705 | 705 |
| 706 EXPECT_TRUE(embedded_test_server()->Start()); |
| 706 GURL url = embedded_test_server()->GetURL("/simple.html"); | 707 GURL url = embedded_test_server()->GetURL("/simple.html"); |
| 707 AddTabAtIndex(0, url, PAGE_TRANSITION_TYPED); | 708 AddTabAtIndex(0, url, PAGE_TRANSITION_TYPED); |
| 708 | 709 |
| 709 // Validate that going fullscreen for a URL defaults to asking permision. | 710 // Validate that going fullscreen for a URL defaults to asking permision. |
| 710 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(true)); | 711 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(true)); |
| 711 ASSERT_TRUE(IsWindowFullscreenForTabOrPending()); | 712 ASSERT_TRUE(IsWindowFullscreenForTabOrPending()); |
| 712 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(false)); | 713 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(false)); |
| 713 ASSERT_FALSE(IsWindowFullscreenForTabOrPending()); | 714 ASSERT_FALSE(IsWindowFullscreenForTabOrPending()); |
| 714 } | 715 } |
| 715 | 716 |
| 716 INSTANTIATE_TEST_CASE_P( | 717 INSTANTIATE_TEST_CASE_P( |
| 717 ParamaterizedFullscreenControllerInteractiveTestInstance, | 718 ParamaterizedFullscreenControllerInteractiveTestInstance, |
| 718 ParamaterizedFullscreenControllerInteractiveTest, | 719 ParamaterizedFullscreenControllerInteractiveTest, |
| 719 ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END)); | 720 ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END)); |
| OLD | NEW |