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

Unified Diff: components/invalidation/invalidation_notifier.cc

Issue 446223002: Remove WeakHandle from components/invalidation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Hack to fix GN Created 6 years, 4 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/invalidation/invalidation_notifier.cc
diff --git a/components/invalidation/invalidation_notifier.cc b/components/invalidation/invalidation_notifier.cc
index daaec4d43516aaaa9038bd1286d112b039546b18..359ac059d9b14fa30506d962e6345bf17c7105dd 100644
--- a/components/invalidation/invalidation_notifier.cc
+++ b/components/invalidation/invalidation_notifier.cc
@@ -22,11 +22,15 @@ InvalidationNotifier::InvalidationNotifier(
const std::string& invalidator_client_id,
const UnackedInvalidationsMap& saved_invalidations,
const std::string& invalidation_bootstrap_data,
- const WeakHandle<InvalidationStateTracker>& invalidation_state_tracker,
+ const base::WeakPtr<InvalidationStateTracker>& invalidation_state_tracker,
+ scoped_refptr<base::SingleThreadTaskRunner>
+ invalidation_state_tracker_task_runner,
const std::string& client_info)
: state_(STOPPED),
saved_invalidations_(saved_invalidations),
invalidation_state_tracker_(invalidation_state_tracker),
+ invalidation_state_tracker_task_runner_(
+ invalidation_state_tracker_task_runner),
client_info_(client_info),
invalidator_client_id_(invalidator_client_id),
invalidation_bootstrap_data_(invalidation_bootstrap_data),
@@ -64,9 +68,12 @@ void InvalidationNotifier::UpdateCredentials(
if (state_ == STOPPED) {
invalidation_listener_.Start(
base::Bind(&invalidation::CreateInvalidationClient),
- invalidator_client_id_, client_info_, invalidation_bootstrap_data_,
+ invalidator_client_id_,
+ client_info_,
+ invalidation_bootstrap_data_,
saved_invalidations_,
invalidation_state_tracker_,
+ invalidation_state_tracker_task_runner_,
this);
state_ = STARTED;
}

Powered by Google App Engine
This is Rietveld 408576698