chrome/test/base/testing_profile.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/test/base/testing_profile.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

Index: chrome/test/base/testing_profile.cc

diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc

index 9e09f2e4be5a5baad9f2ab029ddca897eae8f625..5ffdd308efd7207a3e69d91e88cc48c11ec3b1ff 100644

--- a/chrome/test/base/testing_profile.cc

+++ b/chrome/test/base/testing_profile.cc

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

#include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chrome_notification_types.h"

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

#include "chrome/browser/favicon/chrome_favicon_client_factory.h"

#include "chrome/browser/favicon/favicon_service.h"

#include "chrome/browser/favicon/favicon_service_factory.h"

@@ -53,6 +52,7 @@

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

#include "components/bookmarks/browser/bookmark_model.h"

#include "components/bookmarks/common/bookmark_constants.h"

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

#include "components/history/core/browser/top_sites_observer.h"

#include "components/keyed_service/content/browser_context_dependency_manager.h"

#include "components/policy/core/common/policy_service.h"

« no previous file with comments | « chrome/common/pref_names.cc ('k') | chrome/test/ppapi/ppapi_browsertest.cc » ('j') | no next file with comments »