components/content_settings/core/browser/host_content_settings_map.cc - Issue 2587883003: Revert of Force HostContentSettingsMap to be destroyed on its owning thread.

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: components/content_settings/core/browser/host_content_settings_map.cc

Issue 2587883003: Revert of Force HostContentSettingsMap to be destroyed on its owning thread. (Closed)

Patch Set: Created 4 years 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 | « components/content_settings/core/browser/cookie_settings_unittest.cc ('k') | components/keyed_service/core/refcounted_keyed_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/content_settings/core/browser/host_content_settings_map.cc

diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc

index 89fae035973e182e51da0b35e3b73817fc4be2af..16e073e758c7879646417a4cbade7e702c240998 100644

--- a/components/content_settings/core/browser/host_content_settings_map.cc

+++ b/components/content_settings/core/browser/host_content_settings_map.cc

@@ -14,7 +14,6 @@

#include "base/metrics/histogram_macros.h"

#include "base/strings/string_util.h"

#include "base/strings/utf_string_conversions.h"

-#include "base/threading/thread_task_runner_handle.h"

#include "base/time/clock.h"

#include "build/build_config.h"

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

@@ -179,7 +178,7 @@

HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,

bool is_incognito_profile,

bool is_guest_profile)

- : RefcountedKeyedService(base::ThreadTaskRunnerHandle::Get()),

+ :

#ifndef NDEBUG

used_from_thread_id_(base::PlatformThread::CurrentId()),

#endif

@@ -828,7 +827,6 @@

}

HostContentSettingsMap::~HostContentSettingsMap() {

- DCHECK(thread_checker_.CalledOnValidThread());

DCHECK(!prefs_);

}