chrome/browser/content_settings/content_settings_pref_provider_unittest.cc - Issue 670953006: Componentize HostContentSettingsMap and content settings providers.

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 670953006: Componentize HostContentSettingsMap and content settings providers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: win64 suppress warnings Created 6 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.cc ('k') | chrome/browser/content_settings/content_settings_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 682f0f7fdf3cd1eeed8d24629a36cd9517479461..05c631f121a3fac249f248958d000c1f87ae4bf6 100644

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

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

@@ -2,7 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "chrome/browser/content_settings/content_settings_pref_provider.h"

+#include "components/content_settings/core/browser/content_settings_pref_provider.h"

#include "base/auto_reset.h"

#include "base/command_line.h"

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

#include "base/threading/platform_thread.h"

#include "base/values.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/pref_service_mock_factory.h"

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

@@ -27,6 +26,7 @@

#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_utils.h"

#include "components/pref_registry/pref_registry_syncable.h"

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

#include "url/gurl.h"