chrome/browser/content_settings/content_settings_pref_provider_unittest.cc - Issue 11243002: Move the bits of Prefs where production code has only trivially easy

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 11243002: Move the bits of Prefs where production code has only trivially easy (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, fix gypi problem Created 8 years, 2 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_pref_provider.h ('k') | chrome/browser/content_settings/cookie_settings.h » ('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 726262ea9e4e348ba1acc36b50c9775ba940aaa8..3d9de6852077423d4f0efe58a2d26f6e0412a38b 100644

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

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

@@ -8,18 +8,18 @@

#include "base/command_line.h"

#include "base/memory/scoped_ptr.h"

#include "base/message_loop.h"

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

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

+#include "base/prefs/public/pref_change_registrar.h"

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

#include "base/threading/platform_thread.h"

#include "base/values.h"

-#include "chrome/browser/api/prefs/pref_change_registrar.h"

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

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

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

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

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

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

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

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

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

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"