chrome/browser/extensions/api/content_settings/content_settings_apitest.cc - Issue 1658793002: Update chrome for new prefs location.

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/extensions/api/content_settings/content_settings_apitest.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/commands/command_service_browsertest.cc ('k') | chrome/browser/extensions/api/copresence/copresence_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

diff --git a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

index 8d5558d763555c2420b2f0ed2d12500a3890ff51..1447af8ad9e40e7a03c094740c30c2a0dc9adcda 100644

--- a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

+++ b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

@@ -3,7 +3,6 @@

// found in the LICENSE file.

#include "base/location.h"

-#include "base/prefs/pref_service.h"

#include "base/single_thread_task_runner.h"

#include "base/strings/utf_string_conversions.h"

#include "base/thread_task_runner_handle.h"

@@ -19,6 +18,7 @@

#include "chrome/common/chrome_switches.h"

#include "components/content_settings/core/browser/cookie_settings.h"

#include "components/content_settings/core/browser/host_content_settings_map.h"

+#include "components/prefs/pref_service.h"

#include "content/public/browser/notification_service.h"

#include "content/public/browser/plugin_service.h"

#include "content/public/common/content_switches.h"