| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 <stdint.h> | 5 #include <stdint.h> |
| 6 #include <string> | 6 #include <string> |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
| (...skipping 598 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 609 // the official builders don't read that. | 609 // the official builders don't read that. |
| 610 feature_list.InitWithFeatures({features::kFilterSameOriginTinyPlugin}, | 610 feature_list.InitWithFeatures({features::kFilterSameOriginTinyPlugin}, |
| 611 {features::kPreferHtmlOverPlugins}); | 611 {features::kPreferHtmlOverPlugins}); |
| 612 } | 612 } |
| 613 | 613 |
| 614 private: | 614 private: |
| 615 base::test::ScopedFeatureList feature_list; | 615 base::test::ScopedFeatureList feature_list; |
| 616 }; | 616 }; |
| 617 | 617 |
| 618 // Flaky on Mac. crbug.com/680544 | 618 // Flaky on Mac. crbug.com/680544 |
| 619 #if defined(OS_MACOSX) | 619 // Flaky on Win7. crbug.com/682039 |
| 620 #if defined(OS_MACOSX) || defined(OS_WIN) |
| 620 #define MAYBE_BlockSameOriginTinyPlugin DISABLED_BlockSameOriginTinyPlugin | 621 #define MAYBE_BlockSameOriginTinyPlugin DISABLED_BlockSameOriginTinyPlugin |
| 621 #else | 622 #else |
| 622 #define MAYBE_BlockSameOriginTinyPlugin BlockSameOriginTinyPlugin | 623 #define MAYBE_BlockSameOriginTinyPlugin BlockSameOriginTinyPlugin |
| 623 #endif | 624 #endif |
| 624 IN_PROC_BROWSER_TEST_F(PluginPowerSaverFilterSameOriginTinyPluginsBrowserTest, | 625 IN_PROC_BROWSER_TEST_F(PluginPowerSaverFilterSameOriginTinyPluginsBrowserTest, |
| 625 MAYBE_BlockSameOriginTinyPlugin) { | 626 MAYBE_BlockSameOriginTinyPlugin) { |
| 626 LoadHTML("/same_origin_tiny_plugin.html"); | 627 LoadHTML("/same_origin_tiny_plugin.html"); |
| 627 | 628 |
| 628 VerifyPluginIsPlaceholderOnly("tiny_same_origin"); | 629 VerifyPluginIsPlaceholderOnly("tiny_same_origin"); |
| 629 | 630 |
| (...skipping 19 matching lines...) Expand all Loading... |
| 649 IN_PROC_BROWSER_TEST_F(PluginPowerSaverPreferHtmlBrowserTest, | 650 IN_PROC_BROWSER_TEST_F(PluginPowerSaverPreferHtmlBrowserTest, |
| 650 ThrottlePluginsOnAllowContentSetting) { | 651 ThrottlePluginsOnAllowContentSetting) { |
| 651 HostContentSettingsMap* content_settings_map = | 652 HostContentSettingsMap* content_settings_map = |
| 652 HostContentSettingsMapFactory::GetForProfile(browser()->profile()); | 653 HostContentSettingsMapFactory::GetForProfile(browser()->profile()); |
| 653 | 654 |
| 654 content_settings_map->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS, | 655 content_settings_map->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS, |
| 655 CONTENT_SETTING_ALLOW); | 656 CONTENT_SETTING_ALLOW); |
| 656 LoadPeripheralPlugin(); | 657 LoadPeripheralPlugin(); |
| 657 VerifyPluginIsThrottled(GetActiveWebContents(), "plugin"); | 658 VerifyPluginIsThrottled(GetActiveWebContents(), "plugin"); |
| 658 } | 659 } |
| OLD | NEW |