chrome/test/base/testing_profile.cc - Issue 440423003: Clean content_settings_pattern_parser.* from unnecessary dependencies.

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 440423003: Clean content_settings_pattern_parser.* from unnecessary dependencies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix CrOS tests Created 6 years, 4 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

« chrome/common/content_settings_pattern_parser_unittest.cc ('K') | « chrome/test/base/chrome_render_view_test.cc ('k') | components/content_settings.gypi » ('j') | components/content_settings/core/common/embedder_variables.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/base/testing_profile.cc

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

index 72f1e80b7b13ed31f89f5080308e4d0a89ac0caf..9252e8d8fb878e8ad3aeefdce0f4d1de66f4e30f 100644

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

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

@@ -46,6 +46,7 @@

#include "chrome/browser/webdata/web_data_service_factory.h"

#include "chrome/common/chrome_constants.h"

#include "chrome/common/chrome_switches.h"

+#include "chrome/common/content_settings_component.h"

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

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

@@ -330,6 +331,8 @@ void TestingProfile::Init() {

content::BrowserThread::UI) ||

content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));

+ InitContentSettingsComponent();

#if defined(OS_ANDROID)

// Make sure token service knows its running in tests.

AndroidProfileOAuth2TokenService::set_is_testing_profile();