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

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

Issue 1312453005: Removed Profile::GetHostContentSettingsMap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed patch conflict Created 5 years, 3 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 10 matching lines...) Expand all
21 #include "base/strings/stringprintf.h" 21 #include "base/strings/stringprintf.h"
22 #include "base/strings/utf_string_conversions.h" 22 #include "base/strings/utf_string_conversions.h"
23 #include "base/test/histogram_tester.h" 23 #include "base/test/histogram_tester.h"
24 #include "base/test/test_timeouts.h" 24 #include "base/test/test_timeouts.h"
25 #include "base/values.h" 25 #include "base/values.h"
26 #include "chrome/browser/browsing_data/browsing_data_helper.h" 26 #include "chrome/browser/browsing_data/browsing_data_helper.h"
27 #include "chrome/browser/browsing_data/browsing_data_remover.h" 27 #include "chrome/browser/browsing_data/browsing_data_remover.h"
28 #include "chrome/browser/browsing_data/browsing_data_remover_test_util.h" 28 #include "chrome/browser/browsing_data/browsing_data_remover_test_util.h"
29 #include "chrome/browser/chrome_content_browser_client.h" 29 #include "chrome/browser/chrome_content_browser_client.h"
30 #include "chrome/browser/chrome_notification_types.h" 30 #include "chrome/browser/chrome_notification_types.h"
31 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
31 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h" 32 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
32 #include "chrome/browser/extensions/extension_apitest.h" 33 #include "chrome/browser/extensions/extension_apitest.h"
33 #include "chrome/browser/external_protocol/external_protocol_handler.h" 34 #include "chrome/browser/external_protocol/external_protocol_handler.h"
34 #include "chrome/browser/net/prediction_options.h" 35 #include "chrome/browser/net/prediction_options.h"
35 #include "chrome/browser/predictors/autocomplete_action_predictor.h" 36 #include "chrome/browser/predictors/autocomplete_action_predictor.h"
36 #include "chrome/browser/predictors/autocomplete_action_predictor_factory.h" 37 #include "chrome/browser/predictors/autocomplete_action_predictor_factory.h"
37 #include "chrome/browser/prerender/prerender_contents.h" 38 #include "chrome/browser/prerender/prerender_contents.h"
38 #include "chrome/browser/prerender/prerender_field_trial.h" 39 #include "chrome/browser/prerender/prerender_field_trial.h"
39 #include "chrome/browser/prerender/prerender_handle.h" 40 #include "chrome/browser/prerender/prerender_handle.h"
40 #include "chrome/browser/prerender/prerender_link_manager.h" 41 #include "chrome/browser/prerender/prerender_link_manager.h"
(...skipping 1949 matching lines...) Expand 10 before | Expand all | Expand 10 after
1990 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderDelayLoadPlugin) { 1991 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderDelayLoadPlugin) {
1991 PrerenderTestURL("files/prerender/prerender_plugin_delay_load.html", 1992 PrerenderTestURL("files/prerender/prerender_plugin_delay_load.html",
1992 FINAL_STATUS_USED, 1); 1993 FINAL_STATUS_USED, 1);
1993 NavigateToDestURL(); 1994 NavigateToDestURL();
1994 } 1995 }
1995 1996
1996 // For Content Setting DETECT, checks that plugins are not loaded while 1997 // For Content Setting DETECT, checks that plugins are not loaded while
1997 // a page is being preloaded, but are loaded when the page is displayed. 1998 // a page is being preloaded, but are loaded when the page is displayed.
1998 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderContentSettingDetect) { 1999 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderContentSettingDetect) {
1999 HostContentSettingsMap* content_settings_map = 2000 HostContentSettingsMap* content_settings_map =
2000 current_browser()->profile()->GetHostContentSettingsMap(); 2001 HostContentSettingsMapFactory::GetForProfile(
2002 current_browser()->profile());
2001 content_settings_map->SetDefaultContentSetting( 2003 content_settings_map->SetDefaultContentSetting(
2002 CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_DETECT_IMPORTANT_CONTENT); 2004 CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_DETECT_IMPORTANT_CONTENT);
2003 2005
2004 PrerenderTestURL("files/prerender/prerender_plugin_power_saver.html", 2006 PrerenderTestURL("files/prerender/prerender_plugin_power_saver.html",
2005 FINAL_STATUS_USED, 1); 2007 FINAL_STATUS_USED, 1);
2006 2008
2007 DisableJavascriptCalls(); 2009 DisableJavascriptCalls();
2008 NavigateToDestURL(); 2010 NavigateToDestURL();
2009 bool second_placeholder_present = false; 2011 bool second_placeholder_present = false;
2010 ASSERT_TRUE(content::ExecuteScriptAndExtractBool( 2012 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
2011 GetActiveWebContents(), "AwaitPluginPrerollAndPlaceholder();", 2013 GetActiveWebContents(), "AwaitPluginPrerollAndPlaceholder();",
2012 &second_placeholder_present)); 2014 &second_placeholder_present));
2013 EXPECT_TRUE(second_placeholder_present); 2015 EXPECT_TRUE(second_placeholder_present);
2014 } 2016 }
2015 2017
2016 // For Content Setting BLOCK, checks that plugins are never loaded. 2018 // For Content Setting BLOCK, checks that plugins are never loaded.
2017 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderContentSettingBlock) { 2019 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderContentSettingBlock) {
2018 HostContentSettingsMap* content_settings_map = 2020 HostContentSettingsMap* content_settings_map =
2019 current_browser()->profile()->GetHostContentSettingsMap(); 2021 HostContentSettingsMapFactory::GetForProfile(
2022 current_browser()->profile());
2020 content_settings_map->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS, 2023 content_settings_map->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS,
2021 CONTENT_SETTING_BLOCK); 2024 CONTENT_SETTING_BLOCK);
2022 2025
2023 PrerenderTestURL("files/prerender/prerender_plugin_never_load.html", 2026 PrerenderTestURL("files/prerender/prerender_plugin_never_load.html",
2024 FINAL_STATUS_USED, 1); 2027 FINAL_STATUS_USED, 1);
2025 NavigateToDestURL(); 2028 NavigateToDestURL();
2026 } 2029 }
2027 2030
2028 // Checks that we don't load a NaCl plugin when NaCl is disabled. 2031 // Checks that we don't load a NaCl plugin when NaCl is disabled.
2029 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderNaClPluginDisabled) { 2032 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderNaClPluginDisabled) {
(...skipping 2128 matching lines...) Expand 10 before | Expand all | Expand 10 after
4158 4161
4159 NavigateToDestURL(); 4162 NavigateToDestURL();
4160 EXPECT_EQ(1U, task_manager.tasks().size()); 4163 EXPECT_EQ(1U, task_manager.tasks().size());
4161 } 4164 }
4162 4165
4163 } // namespace 4166 } // namespace
4164 4167
4165 #endif // defined(ENABLE_TASK_MANAGER) 4168 #endif // defined(ENABLE_TASK_MANAGER)
4166 4169
4167 } // namespace prerender 4170 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/browser/plugins/plugin_info_message_filter_unittest.cc ('k') | chrome/browser/profile_resetter/profile_resetter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698