Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Unified Diff: components/keyed_service/core/dependency_manager.cc

Issue 1090373003: Allow cross dependencies between BCKSF and BSKSF (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix dependencies and DCHECK in Get{Original,Underlying}ContextInternal Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/keyed_service/core/dependency_manager.cc
diff --git a/components/keyed_service/core/dependency_manager.cc b/components/keyed_service/core/dependency_manager.cc
index 7eea3cdc330791c233a99d4a8a694788c53a5bd3..4f35244e04fa3332c13ce0b81ec107173e488813 100644
--- a/components/keyed_service/core/dependency_manager.cc
+++ b/components/keyed_service/core/dependency_manager.cc
@@ -34,7 +34,7 @@ void DependencyManager::AddEdge(KeyedServiceBaseFactory* depended,
}
void DependencyManager::RegisterPrefsForServices(
- const base::SupportsUserData* context,
+ base::SupportsUserData* context,
user_prefs::PrefRegistrySyncable* pref_registry) {
std::vector<DependencyNode*> construction_order;
if (!dependency_graph_.GetConstructionOrder(&construction_order)) {
@@ -106,7 +106,7 @@ void DependencyManager::DestroyContextServices(
#ifndef NDEBUG
void DependencyManager::AssertContextWasntDestroyed(
- const base::SupportsUserData* context) {
+ base::SupportsUserData* context) {
if (dead_context_pointers_.find(context) != dead_context_pointers_.end()) {
NOTREACHED() << "Attempted to access a context that was ShutDown(). "
<< "This is most likely a heap smasher in progress. After "
@@ -116,7 +116,7 @@ void DependencyManager::AssertContextWasntDestroyed(
}
void DependencyManager::MarkContextLiveForTesting(
- const base::SupportsUserData* context) {
+ base::SupportsUserData* context) {
dead_context_pointers_.erase(context);
}

Powered by Google App Engine
This is Rietveld 408576698