Move sync notifier contruction out of syncer thread.

chrome/browser/sync/notifier/non_blocking_invalidation_notifier.cc

Index: chrome/browser/sync/notifier/non_blocking_invalidation_notifier.cc
diff --git a/chrome/browser/sync/notifier/non_blocking_invalidation_notifier.cc b/chrome/browser/sync/notifier/non_blocking_invalidation_notifier.cc
index 11adf97fbd3ade7c06e2c11cd95094680f0a00fa..fbf56aa86fd6e355e69ea304cd976c448e61e50e 100644
--- a/chrome/browser/sync/notifier/non_blocking_invalidation_notifier.cc
+++ b/chrome/browser/sync/notifier/non_blocking_invalidation_notifier.cc
@@ -12,7 +12,8 @@ namespace sync_notifier {
 NonBlockingInvalidationNotifier::NonBlockingInvalidationNotifier(
     const notifier::NotifierOptions& notifier_options,
     const std::string& client_info)
-    : parent_message_loop_(MessageLoop::current()),
+    : construction_message_loop_(MessageLoop::current()),
+      method_message_loop_(NULL),
       observers_(new ObserverListThreadSafe<SyncNotifierObserver>()),
       worker_thread_("InvalidationNotifier worker thread"),
       worker_thread_vars_(NULL) {
@@ -29,7 +30,7 @@ NonBlockingInvalidationNotifier::NonBlockingInvalidationNotifier(
 }
 
 NonBlockingInvalidationNotifier::~NonBlockingInvalidationNotifier() {
-  DCHECK_EQ(MessageLoop::current(), parent_message_loop_);
+  DCHECK_EQ(MessageLoop::current(), construction_message_loop_);
   worker_message_loop()->PostTask(
       FROM_HERE,
       NewRunnableMethod(
@@ -41,18 +42,26 @@ NonBlockingInvalidationNotifier::~NonBlockingInvalidationNotifier() {
 
 void NonBlockingInvalidationNotifier::AddObserver(
     SyncNotifierObserver* observer) {
-  DCHECK_EQ(MessageLoop::current(), parent_message_loop_);
+  if (!method_message_loop_) {

[akalin, 2011/04/05 22:02:46]

Same thing as TalkMediatorImpl

[nilesh, 2011/04/05 23:36:17]

Done.

+    method_message_loop_ = MessageLoop::current();
+  } else {
+    DCHECK_EQ(MessageLoop::current(), method_message_loop_);
+  }
   observers_->AddObserver(observer);
 }
 
 void NonBlockingInvalidationNotifier::RemoveObserver(
     SyncNotifierObserver* observer) {
-  DCHECK_EQ(MessageLoop::current(), parent_message_loop_);
+  DCHECK_EQ(MessageLoop::current(), method_message_loop_);
   observers_->RemoveObserver(observer);
 }
 
 void NonBlockingInvalidationNotifier::SetState(const std::string& state) {
-  DCHECK_EQ(MessageLoop::current(), parent_message_loop_);
+  if (!method_message_loop_) {
+    method_message_loop_ = MessageLoop::current();
+  } else {
+    DCHECK_EQ(MessageLoop::current(), method_message_loop_);
+  }
   worker_message_loop()->PostTask(
       FROM_HERE,
       NewRunnableMethod(
@@ -63,7 +72,7 @@ void NonBlockingInvalidationNotifier::SetState(const std::string& state) {
 
 void NonBlockingInvalidationNotifier::UpdateCredentials(
     const std::string& email, const std::string& token) {
-  DCHECK_EQ(MessageLoop::current(), parent_message_loop_);
+  DCHECK_EQ(MessageLoop::current(), method_message_loop_);
   worker_message_loop()->PostTask(
       FROM_HERE,
       NewRunnableMethod(
@@ -74,7 +83,7 @@ void NonBlockingInvalidationNotifier::UpdateCredentials(
 
 void NonBlockingInvalidationNotifier::UpdateEnabledTypes(
     const syncable::ModelTypeSet& types) {
-  DCHECK_EQ(MessageLoop::current(), parent_message_loop_);
+  DCHECK_EQ(MessageLoop::current(), method_message_loop_);
   worker_message_loop()->PostTask(
       FROM_HERE,
       NewRunnableMethod(
@@ -84,7 +93,7 @@ void NonBlockingInvalidationNotifier::UpdateEnabledTypes(
 }
 
 void NonBlockingInvalidationNotifier::SendNotification() {
-  DCHECK_EQ(MessageLoop::current(), parent_message_loop_);
+  DCHECK_EQ(MessageLoop::current(), method_message_loop_);
   // InvalidationClient doesn't implement SendNotification(), so no
   // need to forward on the call.
 }
@@ -94,7 +103,8 @@ MessageLoop* NonBlockingInvalidationNotifier::worker_message_loop() {
   DCHECK(current_message_loop);
   MessageLoop* worker_message_loop = worker_thread_.message_loop();
   DCHECK(worker_message_loop);
-  DCHECK(current_message_loop == parent_message_loop_ ||
+  DCHECK(current_message_loop == construction_message_loop_ ||
+         current_message_loop == method_message_loop_ ||
          current_message_loop == worker_message_loop);
   return worker_message_loop;
 }