Replace deprecated base::NonThreadSafe in chrome/browser/themes in favor of SequenceChecker.

chrome/browser/themes/theme_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/themes/theme_service.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 207 matching lines @@
     : ready_(false),
       rb_(ResourceBundle::GetSharedInstance()),
       profile_(nullptr),
       installed_pending_load_id_(kDefaultThemeID),
       number_of_infobars_(0),
       original_theme_provider_(*this, false),
       incognito_theme_provider_(*this, true),
       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();
 
   registrar_.Add(this,
                  extensions::NOTIFICATION_EXTENSIONS_READY_DEPRECATED,
                  content::Source<Profile>(profile_));
 
   theme_syncable_service_.reset(new ThemeSyncableService(profile_, this));
 }
@@ skipping 270 matching lines @@
 #endif
   }
 
   // Always fall back to the non-incognito color when there's a custom theme
   // because the default (classic) incognito color may be dramatically different
   // (optimized for a light-on-dark color).
   return ThemeProperties::GetDefaultColor(id, incognito && !theme_supplier_);
 }
 
 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))
     return hsl;
 
   // Always fall back to the non-incognito tint when there's a custom theme.
   // See comment in GetDefaultColor().
   return ThemeProperties::GetDefaultTint(id, incognito && !theme_supplier_);
 }
 
@@ skipping 153 matching lines @@
 gfx::ImageSkia* ThemeService::GetImageSkiaNamed(int id, bool incognito) const {
   gfx::Image image = GetImageNamed(id, incognito);
   if (image.IsEmpty())
     return nullptr;
   // TODO(pkotwicz): Remove this const cast.  The gfx::Image interface returns
   // its images const. GetImageSkiaNamed() also should but has many callsites.
   return const_cast<gfx::ImageSkia*>(image.ToImageSkia());
 }
 
 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.
   int theme_supplier_id = id;
   if (incognito) {
     if (id == ThemeProperties::COLOR_FRAME)
       theme_supplier_id = ThemeProperties::COLOR_FRAME_INCOGNITO;
     else if (id == ThemeProperties::COLOR_FRAME_INACTIVE)
       theme_supplier_id = ThemeProperties::COLOR_FRAME_INCOGNITO_INACTIVE;
   }
@@ skipping 43 matching lines @@
   base::RefCountedMemory* data = nullptr;
   if (theme_supplier_)
     data = theme_supplier_->GetRawData(id, scale_factor);
   if (!data)
     data = rb_.LoadDataResourceBytesForScale(id, ui::SCALE_FACTOR_100P);
 
   return data;
 }
 
 gfx::Image ThemeService::GetImageNamed(int id, bool incognito) const {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   int adjusted_id = id;
   if (incognito) {
     if (id == IDR_THEME_FRAME)
       adjusted_id = IDR_THEME_FRAME_INCOGNITO;
     else if (id == IDR_THEME_FRAME_INACTIVE)
       adjusted_id = IDR_THEME_FRAME_INCOGNITO_INACTIVE;
   }
 
   gfx::Image image;
@@ skipping 96 matching lines @@
 
 #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
 bool ThemeService::IsSupervisedUser() const {
   return profile_->IsSupervised();
 }
 
 void ThemeService::SetSupervisedUserTheme() {
   SetCustomDefaultTheme(new SupervisedUserTheme);
 }
 #endif