Replace deprecated base::NonThreadSafe in extensions in favor of SequenceChecker.

extensions/browser/warning_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 "extensions/browser/warning_service.h"
 
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/browser/warning_service_factory.h"
 #include "extensions/common/extension_set.h"
 
 using content::BrowserThread;
 
 namespace extensions {
 
 WarningService::WarningService(content::BrowserContext* browser_context)
     : browser_context_(browser_context), extension_registry_observer_(this) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   if (browser_context_) {
     extension_registry_observer_.Add(ExtensionRegistry::Get(
         ExtensionsBrowserClient::Get()->GetOriginalContext(browser_context_)));
   }
 }
 
-WarningService::~WarningService() {}
+WarningService::~WarningService() {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+}
 
 // static
 WarningService* WarningService::Get(content::BrowserContext* browser_context) {
   return WarningServiceFactory::GetForBrowserContext(browser_context);
 }
 
 void WarningService::ClearWarnings(
     const std::set<Warning::WarningType>& types) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   ExtensionIdSet affected_extensions;
   for (WarningSet::iterator i = warnings_.begin();
        i != warnings_.end();) {
     if (types.find(i->warning_type()) != types.end()) {
       affected_extensions.insert(i->extension_id());
       warnings_.erase(i++);
     } else {
       ++i;
     }
   }
 
   if (!affected_extensions.empty())
     NotifyWarningsChanged(affected_extensions);
 }
 
 std::set<Warning::WarningType> WarningService::
     GetWarningTypesAffectingExtension(const std::string& extension_id) const {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   std::set<Warning::WarningType> result;
   for (WarningSet::const_iterator i = warnings_.begin();
        i != warnings_.end(); ++i) {
     if (i->extension_id() == extension_id)
       result.insert(i->warning_type());
   }
   return result;
 }
 
 std::vector<std::string> WarningService::GetWarningMessagesForExtension(
     const std::string& extension_id) const {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   std::vector<std::string> result;
 
   const ExtensionSet& extension_set =
       ExtensionRegistry::Get(browser_context_)->enabled_extensions();
 
   for (WarningSet::const_iterator i = warnings_.begin();
        i != warnings_.end(); ++i) {
     if (i->extension_id() == extension_id)
       result.push_back(i->GetLocalizedMessage(&extension_set));
   }
   return result;
 }
 
 void WarningService::AddWarnings(const WarningSet& warnings) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   ExtensionIdSet affected_extensions;
   for (const Warning& warning : warnings) {
     if (warnings_.insert(warning).second)
       affected_extensions.insert(warning.extension_id());
   }
   if (!affected_extensions.empty())
     NotifyWarningsChanged(affected_extensions);
 }
 
@@ skipping 35 matching lines @@
     const Extension* extension,
     UnloadedExtensionReason reason) {
   // Unloading one extension might have solved the problems of others.
   // Therefore, we clear warnings of this type for all extensions.
   std::set<Warning::WarningType> warning_types =
       GetWarningTypesAffectingExtension(extension->id());
   ClearWarnings(warning_types);
 }
 
 }  // namespace extensions