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

Side by Side Diff: chrome/browser/prerender/prerender_browsertest.cc

Issue 902223002: Plugin Power Saver: Remove ASK (left C2P). Replace with DETECT. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 10 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
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 <vector> 6 #include <vector>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 2062 matching lines...) Expand 10 before | Expand all | Expand 10 after
2073 HostContentSettingsMap* content_settings_map = 2073 HostContentSettingsMap* content_settings_map =
2074 current_browser()->profile()->GetHostContentSettingsMap(); 2074 current_browser()->profile()->GetHostContentSettingsMap();
2075 content_settings_map->SetDefaultContentSetting( 2075 content_settings_map->SetDefaultContentSetting(
2076 CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_DETECT_IMPORTANT_CONTENT); 2076 CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_DETECT_IMPORTANT_CONTENT);
2077 2077
2078 PrerenderTestURL("files/prerender/prerender_plugin_power_saver.html", 2078 PrerenderTestURL("files/prerender/prerender_plugin_power_saver.html",
2079 FINAL_STATUS_USED, 1); 2079 FINAL_STATUS_USED, 1);
2080 NavigateToDestURL(); 2080 NavigateToDestURL();
2081 } 2081 }
2082 2082
2083 // Checks that plugins are not loaded on prerendering pages when click-to-play
2084 // is enabled.
2085 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClickToPlay) {
2086 // Enable click-to-play.
2087 HostContentSettingsMap* content_settings_map =
2088 current_browser()->profile()->GetHostContentSettingsMap();
2089 content_settings_map->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS,
2090 CONTENT_SETTING_ASK);
2091
2092 PrerenderTestURL("files/prerender/prerender_plugin_click_to_play.html",
2093 FINAL_STATUS_USED, 1);
2094 NavigateToDestURL();
2095 }
2096
2097 // Checks that we don't load a NaCl plugin when NaCl is disabled. 2083 // Checks that we don't load a NaCl plugin when NaCl is disabled.
2098 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderNaClPluginDisabled) { 2084 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderNaClPluginDisabled) {
2099 PrerenderTestURL("files/prerender/prerender_plugin_nacl_disabled.html", 2085 PrerenderTestURL("files/prerender/prerender_plugin_nacl_disabled.html",
2100 FINAL_STATUS_USED, 2086 FINAL_STATUS_USED,
2101 1); 2087 1);
2102 NavigateToDestURL(); 2088 NavigateToDestURL();
2103 2089
2104 2090
2105 // Run this check again. When we try to load aa ppapi plugin, the 2091 // Run this check again. When we try to load aa ppapi plugin, the
2106 // "loadstart" event is asynchronously posted to a message loop. 2092 // "loadstart" event is asynchronously posted to a message loop.
(...skipping 2216 matching lines...) Expand 10 before | Expand all | Expand 10 after
4323 TestShouldDisableLocalPredictorPreferenceNetworkMatrix( 4309 TestShouldDisableLocalPredictorPreferenceNetworkMatrix(
4324 true /*preference_wifi_network_wifi*/, 4310 true /*preference_wifi_network_wifi*/,
4325 true /*preference_wifi_network_4g*/, 4311 true /*preference_wifi_network_4g*/,
4326 true /*preference_always_network_wifi*/, 4312 true /*preference_always_network_wifi*/,
4327 false /*preference_always_network_4g*/, 4313 false /*preference_always_network_4g*/,
4328 true /*preference_never_network_wifi*/, 4314 true /*preference_never_network_wifi*/,
4329 true /*preference_never_network_4g*/); 4315 true /*preference_never_network_4g*/);
4330 } 4316 }
4331 4317
4332 } // namespace prerender 4318 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/browser/plugins/plugin_info_message_filter.cc ('k') | chrome/browser/resources/options/content_settings.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698