chrome/browser/content_settings/content_settings_pref_provider_unittest.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/content_settings/content_settings_pref_provider_unittest.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/content_settings/content_settings_policy_provider_unittest.cc ('k') | chrome/browser/content_settings/content_settings_supervised_provider_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

index a24599f60ba997dc7d026aac7ccc4e7c2b45699e..7bd4b66a376398c61bf5aaf06c8a10f16263f2e9 100644

--- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

+++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

@@ -9,12 +9,6 @@

#include "base/macros.h"

#include "base/memory/scoped_ptr.h"

#include "base/message_loop/message_loop.h"

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

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

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

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

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

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

#include "base/test/simple_test_clock.h"

#include "base/threading/platform_thread.h"

#include "base/values.h"

@@ -32,6 +26,12 @@

#include "components/content_settings/core/common/content_settings_pattern.h"

#include "components/content_settings/core/test/content_settings_test_utils.h"

#include "components/pref_registry/pref_registry_syncable.h"

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

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

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

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

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

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

#include "components/syncable_prefs/pref_service_mock_factory.h"

#include "components/syncable_prefs/pref_service_syncable.h"

#include "components/syncable_prefs/testing_pref_service_syncable.h"