| 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 12 matching lines...) Expand all Loading... |
| 23 #include "content/public/common/content_switches.h" | 23 #include "content/public/common/content_switches.h" |
| 24 #include "content/public/common/url_constants.h" | 24 #include "content/public/common/url_constants.h" |
| 25 #include "net/test/embedded_test_server/embedded_test_server.h" | 25 #include "net/test/embedded_test_server/embedded_test_server.h" |
| 26 | 26 |
| 27 using url::kAboutBlankURL; | 27 using url::kAboutBlankURL; |
| 28 using content::WebContents; | 28 using content::WebContents; |
| 29 using ui::PAGE_TRANSITION_TYPED; | 29 using ui::PAGE_TRANSITION_TYPED; |
| 30 | 30 |
| 31 namespace { | 31 namespace { |
| 32 | 32 |
| 33 const base::FilePath::CharType* kSimpleFile = FILE_PATH_LITERAL("/simple.html"); | 33 const base::FilePath::CharType* kSimpleFile = FILE_PATH_LITERAL("simple.html"); |
| 34 | 34 |
| 35 } // namespace | 35 } // namespace |
| 36 | 36 |
| 37 class FullscreenControllerInteractiveTest | 37 class FullscreenControllerInteractiveTest |
| 38 : public FullscreenControllerTest { | 38 : public FullscreenControllerTest { |
| 39 protected: | 39 protected: |
| 40 | 40 |
| 41 // Tests that actually make the browser fullscreen have been flaky when | 41 // Tests that actually make the browser fullscreen have been flaky when |
| 42 // run sharded, and so are restricted here to interactive ui tests. | 42 // run sharded, and so are restricted here to interactive ui tests. |
| 43 void ToggleTabFullscreen(bool enter_fullscreen); | 43 void ToggleTabFullscreen(bool enter_fullscreen); |
| (...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 710 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(true)); | 710 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(true)); |
| 711 ASSERT_TRUE(IsWindowFullscreenForTabOrPending()); | 711 ASSERT_TRUE(IsWindowFullscreenForTabOrPending()); |
| 712 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(false)); | 712 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(false)); |
| 713 ASSERT_FALSE(IsWindowFullscreenForTabOrPending()); | 713 ASSERT_FALSE(IsWindowFullscreenForTabOrPending()); |
| 714 } | 714 } |
| 715 | 715 |
| 716 INSTANTIATE_TEST_CASE_P( | 716 INSTANTIATE_TEST_CASE_P( |
| 717 ParamaterizedFullscreenControllerInteractiveTestInstance, | 717 ParamaterizedFullscreenControllerInteractiveTestInstance, |
| 718 ParamaterizedFullscreenControllerInteractiveTest, | 718 ParamaterizedFullscreenControllerInteractiveTest, |
| 719 ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END)); | 719 ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END)); |
| OLD | NEW |