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

chrome/browser/themes/theme_service_mac.mm

 // Copyright (c) 2011 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"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/logging.h"
 #include "chrome/browser/themes/browser_theme_pack.h"
@@ skipping 26 matching lines @@
   SkColorToHSV(color, hsv);
 
   *h = SkScalarToDouble(hsv[0]) / 360.0;
   *s = SkScalarToDouble(hsv[1]);
   *b = SkScalarToDouble(hsv[2]);
 }
 
 }  // namespace
 
 NSImage* ThemeService::GetNSImageNamed(int id, bool incognito) const {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   bool is_tab_or_toolbar_color =
       id == IDR_THEME_TAB_BACKGROUND_INACTIVE ||
       id == IDR_THEME_TOOLBAR_INACTIVE ||
       id == IDR_THEME_TAB_BACKGROUND ||
       id == IDR_THEME_TOOLBAR;
   // TODO(ellyjones): remove traces of the MD redesign from this file. See
   // crbug.com/648281
   bool isModeMaterial = true;
 
@@ skipping 82 matching lines @@
     [empty_image lockFocus];
     [[NSColor redColor] set];
     NSRectFill(image_rect);
     [empty_image unlockFocus];
   }
 
   return empty_image;
 }
 
 NSColor* ThemeService::GetNSImageColorNamed(int id, bool incognito) const {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   bool is_tab_or_toolbar_color =
       id == IDR_THEME_TAB_BACKGROUND_INACTIVE ||
       id == IDR_THEME_TOOLBAR_INACTIVE ||
       id == IDR_THEME_TAB_BACKGROUND ||
       id == IDR_THEME_TOOLBAR;
   bool isModeMaterial = true;
 
   // In Material Design, Incognito mode draws tabs and the toolbar using colors
   // that are different from non-Incognito mode. If in MD, offset these ids so
@@ skipping 19 matching lines @@
 
   return image_color;
 }
 
 bool ThemeService::HasCustomColor(int id) const {
   SkColor color;
   return theme_supplier_ && theme_supplier_->GetColor(id, &color);
 }
 
 NSColor* ThemeService::GetNSColor(int id, bool incognito) const {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   int original_id = id;
   const bool is_mode_material = true;
   if (is_mode_material && incognito) {
     id += kMaterialDesignIdOffset;
   }
 
   // Check to see if we already have the color in the cache.
   NSColorMap::const_iterator nscolor_iter = nscolor_cache_.find(id);
   if (nscolor_iter != nscolor_cache_.end())
     return nscolor_iter->second;
 
   SkColor sk_color = GetColor(original_id, incognito);
   NSColor* color = nil;
   if (is_mode_material) {
     color = skia::SkColorToSRGBNSColor(sk_color);
   } else {
     color = skia::SkColorToCalibratedNSColor(sk_color);
   }
 
   // We loaded successfully.  Cache the color.
   if (color)
     nscolor_cache_[id] = [color retain];
 
   return color;
 }
 
 NSColor* ThemeService::GetNSColorTint(int id) const {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   // Check to see if we already have the color in the cache.
   NSColorMap::const_iterator nscolor_iter = nscolor_cache_.find(id);
   if (nscolor_iter != nscolor_cache_.end())
     return nscolor_iter->second;
 
   color_utils::HSL tint = GetTint(id, false);
   NSColor* tint_color = nil;
   if (tint.h == -1 && tint.s == -1 && tint.l == -1) {
     tint_color = [NSColor blackColor];
   } else {
     CGFloat hue, saturation, brightness;
     HSLToHSB(tint, &hue, &saturation, &brightness);
 
     tint_color = [NSColor colorWithCalibratedHue:hue
                                       saturation:saturation
                                       brightness:brightness
                                            alpha:1.0];
   }
 
   // We loaded successfully.  Cache the color.
   if (tint_color)
     nscolor_cache_[id] = [tint_color retain];
 
   return tint_color;
 }
 
 NSGradient* ThemeService::GetNSGradient(int id) const {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   // Check to see if we already have the gradient in the cache.
   NSGradientMap::const_iterator nsgradient_iter = nsgradient_cache_.find(id);
   if (nsgradient_iter != nsgradient_cache_.end())
     return nsgradient_iter->second;
 
   NSGradient* gradient = nil;
 
   // Note that we are not leaking when we assign a retained object to
   // |gradient|; in all cases we cache it before we return.
@@ skipping 62 matching lines @@
 }
 
 // Let all the browser views know that themes have changed in a platform way.
 void ThemeService::NotifyPlatformThemeChanged() {
   NSNotificationCenter* defaultCenter = [NSNotificationCenter defaultCenter];
   [defaultCenter postNotificationName:kBrowserThemeDidChangeNotification
                                object:[NSValue valueWithPointer:this]];
 }
 
 void ThemeService::FreePlatformCaches() {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   // Free images.
   for (NSImageMap::iterator i = nsimage_cache_.begin();
        i != nsimage_cache_.end(); i++) {
     [i->second release];
   }
   nsimage_cache_.clear();
 
   // Free colors.
   for (NSColorMap::iterator i = nscolor_cache_.begin();
@@ skipping 45 matching lines @@
 
 bool ThemeService::BrowserThemeProvider::ShouldIncreaseContrast() const {
   NSWorkspace* workspace = [NSWorkspace sharedWorkspace];
   if ([workspace
           respondsToSelector:@selector(
                                  accessibilityDisplayShouldIncreaseContrast)]) {
     return workspace.accessibilityDisplayShouldIncreaseContrast == YES;
   }
   return false;
 }