Move sync notifier contruction out of syncer thread.

jingle/notifier/listener/talk_mediator_impl.h

Index: jingle/notifier/listener/talk_mediator_impl.h
diff --git a/jingle/notifier/listener/talk_mediator_impl.h b/jingle/notifier/listener/talk_mediator_impl.h
index 5ae0030ef25a7e43bc4e283073fe9b2233de6f8a..726960c7a7acf42e28fd6bad5856d4f480cb6ab3 100644
--- a/jingle/notifier/listener/talk_mediator_impl.h
+++ b/jingle/notifier/listener/talk_mediator_impl.h
@@ -20,6 +20,8 @@
 #include "jingle/notifier/listener/talk_mediator.h"
 #include "talk/xmpp/xmppclientsettings.h"
 
+class MessageLoop;
+
 namespace notifier {
 
 class TalkMediatorImpl
@@ -36,13 +38,18 @@ class TalkMediatorImpl
 
   // TalkMediator implementation.
 
+  // Should be called on the same thread as the constructor.
   virtual void SetDelegate(TalkMediator::Delegate* delegate);
 
+  // All the method below should be called on the same thread. It may or may

[akalin, 2011/04/06 20:35:26]

method -> methods

[nilesh, 2011/04/06 21:58:16]

Done.

+  // not be same as the thread on which the object was constructed.
+
   // |email| must be a valid email address (e.g., foo@bar.com).
   virtual void SetAuthToken(const std::string& email,
                             const std::string& token,
                             const std::string& token_service);
   virtual bool Login();
+  // Users must call Logout once Login is called.
   virtual bool Logout();
 
   virtual bool SendNotification(const Notification& data);
@@ -74,7 +81,7 @@ class TalkMediatorImpl
     unsigned int subscribed : 1;   // Subscribed to the xmpp receiving channel.
   };
 
-  base::NonThreadSafe non_thread_safe_;
+  void CheckOrSetValidThread();
 
   // Delegate, which we don't own.  May be NULL.
   TalkMediator::Delegate* delegate_;
@@ -92,6 +99,9 @@ class TalkMediatorImpl
 
   SubscriptionList subscriptions_;
 
+  MessageLoop* construction_message_loop_;
+  MessageLoop* method_message_loop_;
+
   FRIEND_TEST_ALL_PREFIXES(TalkMediatorImplTest, SetAuthToken);
   FRIEND_TEST_ALL_PREFIXES(TalkMediatorImplTest, SendNotification);
   FRIEND_TEST_ALL_PREFIXES(TalkMediatorImplTest, MediatorThreadCallbacks);