| Index: chrome/browser/themes/theme_service.cc
|
| diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc
|
| index 3a0161e9881e235d2e307ff2307da9b772a3538d..6a9d0e1e40a102972fba8dd3e20467802ff9fe0a 100644
|
| --- a/chrome/browser/themes/theme_service.cc
|
| +++ b/chrome/browser/themes/theme_service.cc
|
| @@ -225,11 +225,12 @@ ThemeService::ThemeService()
|
| weak_ptr_factory_(this) {}
|
|
|
| ThemeService::~ThemeService() {
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| FreePlatformCaches();
|
| }
|
|
|
| void ThemeService::Init(Profile* profile) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| profile_ = profile;
|
|
|
| LoadThemePrefs();
|
| @@ -520,7 +521,7 @@ SkColor ThemeService::GetDefaultColor(int id, bool incognito) const {
|
| }
|
|
|
| color_utils::HSL ThemeService::GetTint(int id, bool incognito) const {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
|
| color_utils::HSL hsl;
|
| if (theme_supplier_ && theme_supplier_->GetTint(id, &hsl))
|
| @@ -694,7 +695,7 @@ gfx::ImageSkia* ThemeService::GetImageSkiaNamed(int id, bool incognito) const {
|
| }
|
|
|
| SkColor ThemeService::GetColor(int id, bool incognito) const {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
|
| // For legacy reasons, |theme_supplier_| requires the incognito variants
|
| // of color IDs.
|
| @@ -758,7 +759,7 @@ base::RefCountedMemory* ThemeService::GetRawData(
|
| }
|
|
|
| gfx::Image ThemeService::GetImageNamed(int id, bool incognito) const {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
|
| int adjusted_id = id;
|
| if (incognito) {
|
|
|