Add DCHECKs for correct thread usage of KeyedService code

Bug: 701326
Change-Id: If652eb76fabc09cabdd61865cdb409f72c140392
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1748083Reviewed-by: Lutz Justen <ljusten@chromium.org>
Reviewed-by: Cait Phillips <caitkp@chromium.org>
Commit-Queue: Derek Schuff <dschuff@chromium.org>
Cr-Commit-Position: refs/heads/master@{#686622}

components/keyed_service/content/browser_context_keyed_service_factory.cc

@@ -60,9 +60,6 @@ KeyedService* BrowserContextKeyedServiceFactory::GetServiceForBrowserContext(
 content::BrowserContext*
 BrowserContextKeyedServiceFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
-  // TODO(crbug.com/701326): This DCHECK should be moved to GetContextToUse().
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-
   // Safe default for Incognito mode: no service.
   if (context->IsOffTheRecord())
     return nullptr;
@@ -103,6 +100,7 @@ bool BrowserContextKeyedServiceFactory::IsOffTheRecord(void* context) const {
 }
 
 void* BrowserContextKeyedServiceFactory::GetContextToUse(void* context) const {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   AssertContextWasntDestroyed(context);
   return GetBrowserContextToUse(static_cast<content::BrowserContext*>(context));
 }

components/keyed_service/content/refcounted_browser_context_keyed_service_factory.cc

@@ -61,9 +61,6 @@ RefcountedBrowserContextKeyedServiceFactory::GetServiceForBrowserContext(
 content::BrowserContext*
 RefcountedBrowserContextKeyedServiceFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
-  // TODO(crbug.com/701326): This DCHECK should be moved to GetContextToUse().
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-
   // Safe default for Incognito mode: no service.
   if (context->IsOffTheRecord())
     return nullptr;
@@ -105,6 +102,7 @@ bool RefcountedBrowserContextKeyedServiceFactory::IsOffTheRecord(
 
 void* RefcountedBrowserContextKeyedServiceFactory::GetContextToUse(
     void* context) const {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   AssertContextWasntDestroyed(context);
   return GetBrowserContextToUse(static_cast<content::BrowserContext*>(context));
 }

components/keyed_service/core/keyed_service_base_factory.cc

+
 // Copyright 2014 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.
@@ -34,9 +35,7 @@ void KeyedServiceBaseFactory::DependsOn(KeyedServiceBaseFactory* rhs) {
 }
 
 void KeyedServiceBaseFactory::AssertContextWasntDestroyed(void* context) const {
-  // TODO(crbug.com/701326): We should DCHECK(CalledOnValidThread()) here, but
-  // currently some code doesn't do service getting on the main thread.
-  // This needs to be fixed and DCHECK should be restored here.
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   dependency_manager_->AssertContextWasntDestroyed(context);
 }
 

components/keyed_service/ios/browser_state_keyed_service_factory.cc

@@ -54,9 +54,6 @@ KeyedService* BrowserStateKeyedServiceFactory::GetServiceForBrowserState(
 
 web::BrowserState* BrowserStateKeyedServiceFactory::GetBrowserStateToUse(
     web::BrowserState* context) const {
-  // TODO(crbug.com/701326): This DCHECK should be moved to GetContextToUse().
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-
   // Safe default for Incognito mode: no service.
   if (context->IsOffTheRecord())
     return nullptr;
@@ -92,6 +89,7 @@ bool BrowserStateKeyedServiceFactory::IsOffTheRecord(void* context) const {
 }
 
 void* BrowserStateKeyedServiceFactory::GetContextToUse(void* context) const {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   AssertContextWasntDestroyed(context);
   return GetBrowserStateToUse(static_cast<web::BrowserState*>(context));
 }

components/keyed_service/ios/refcounted_browser_state_keyed_service_factory.cc

@@ -60,9 +60,6 @@ RefcountedBrowserStateKeyedServiceFactory::GetServiceForBrowserState(
 web::BrowserState*
 RefcountedBrowserStateKeyedServiceFactory::GetBrowserStateToUse(
     web::BrowserState* context) const {
-  // TODO(crbug.com/701326): This DCHECK should be moved to GetContextToUse().
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-
   // Safe default for Incognito mode: no service.
   if (context->IsOffTheRecord())
     return nullptr;
@@ -103,6 +100,7 @@ bool RefcountedBrowserStateKeyedServiceFactory::IsOffTheRecord(
 
 void* RefcountedBrowserStateKeyedServiceFactory::GetContextToUse(
     void* context) const {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   AssertContextWasntDestroyed(context);
   return GetBrowserStateToUse(static_cast<web::BrowserState*>(context));
 }

components/policy/content/policy_blacklist_service.cc

@@ -120,7 +120,5 @@ KeyedService* PolicyBlacklistFactory::BuildServiceInstanceFor(
 
 content::BrowserContext* PolicyBlacklistFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
-  // TODO(crbug.com/701326): This DCHECK should be moved to GetContextToUse().
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   return context;
 }