chrome/browser/content_settings/content_settings_pref_provider_unittest.cc - Issue 1305213009: Componentize PrefSyncableService and support classes.

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 1305213009: Componentize PrefSyncableService and support classes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pref_service_syncable

Patch Set: Add missing dependency on //sync:test_support_sync_api for unit tests with gn 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 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/host_content_settings_map_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 397a5e6521c16c8332f676d59f1bb92a0faabeae..3535afb7923e89a5bf4369ec74ec3b9780d5b1bb 100644

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

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

@@ -19,12 +19,9 @@

#include "base/values.h"

#include "chrome/browser/content_settings/content_settings_mock_observer.h"

#include "chrome/browser/prefs/browser_prefs.h"

-#include "chrome/browser/prefs/pref_service_mock_factory.h"

-#include "chrome/browser/prefs/pref_service_syncable.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

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

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

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

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

@@ -34,6 +31,9 @@

#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/syncable_prefs/pref_service_mock_factory.h"

+#include "components/syncable_prefs/pref_service_syncable.h"

+#include "components/syncable_prefs/testing_pref_service_syncable.h"

#include "content/public/test/test_browser_thread_bundle.h"

#include "testing/gtest/include/gtest/gtest.h"

#include "url/gurl.h"