chrome/browser/content_settings/content_settings_default_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_default_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/component_updater/sw_reporter_installer_win.cc ('k') | chrome/browser/content_settings/content_settings_policy_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_default_provider_unittest.cc

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

index a107c2c6042bd91b499f192b4121449a2f660480..6283f11afbede29d932b1314218fd038a0088e9b 100644

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

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

@@ -4,9 +4,6 @@

#include "base/memory/scoped_ptr.h"

#include "base/message_loop/message_loop.h"

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

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

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

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

#include "chrome/common/pref_names.h"

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

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

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

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

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

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

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

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

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

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

#include "url/gurl.h"