chrome/browser/plugins/plugin_info_message_filter_unittest.cc - Issue 1312453005: Removed Profile::GetHostContentSettingsMap

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/plugins/plugin_info_message_filter_unittest.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:

Index: chrome/browser/plugins/plugin_info_message_filter_unittest.cc

diff --git a/chrome/browser/plugins/plugin_info_message_filter_unittest.cc b/chrome/browser/plugins/plugin_info_message_filter_unittest.cc

index 6d85e9755345f370b3331ecb39cb3e99d728978c..bd5717a7ee282d83441bfe3c72c64fc566a911b8 100644

--- a/chrome/browser/plugins/plugin_info_message_filter_unittest.cc

+++ b/chrome/browser/plugins/plugin_info_message_filter_unittest.cc

@@ -10,6 +10,7 @@

#include "base/message_loop/message_loop.h"

#include "base/run_loop.h"

#include "base/strings/utf_string_conversions.h"

+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"

#include "chrome/common/pref_names.h"

#include "chrome/common/render_messages.h"

#include "chrome/test/base/testing_pref_service_syncable.h"

@@ -210,7 +211,8 @@ TEST_F(PluginInfoMessageFilterTest, FindEnabledPlugin) {

}

TEST_F(PluginInfoMessageFilterTest, GetPluginContentSetting) {

- HostContentSettingsMap* map = profile()->GetHostContentSettingsMap();

+ HostContentSettingsMap* map =

+ HostContentSettingsMapFactory::GetForProfile(profile());

// Block plugins by default.

map->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS,