Move sync notifier contruction out of syncer thread.

chrome/service/cloud_print/cloud_print_proxy_backend.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/service/cloud_print/cloud_print_proxy_backend.h"
 
 #include <map>
 #include <vector>
 
 #include "base/file_util.h"
@@ skipping 363 matching lines @@
     const notifier::NotifierOptions kNotifierOptions;
     talk_mediator_.reset(new notifier::TalkMediatorImpl(
         new notifier::MediatorThreadImpl(kNotifierOptions),
         kNotifierOptions));
     notifier::Subscription subscription;
     subscription.channel = kCloudPrintPushNotificationsSource;
     subscription.channel.append("/proxy/");
     subscription.channel.append(proxy_id);
     subscription.from = kCloudPrintPushNotificationsSource;
     push_notifications_channel_ = subscription.channel;
-    talk_mediator_->AddSubscription(subscription);
     talk_mediator_->SetDelegate(this);
+    // SetAuthToken should be called before AddSubscription.
     talk_mediator_->SetAuthToken(email, cloud_print_xmpp_token,
                                  kSyncGaiaServiceId);
+    talk_mediator_->AddSubscription(subscription);
     talk_mediator_->Login();
 
     print_server_watcher_ = print_system_->CreatePrintServerWatcher();
     print_server_watcher_->StartWatching(this);
 
     proxy_id_ = proxy_id;
 
     StartRegistration();
   } else {
     // We could not initialize the print system. We need to notify the server.
@@ skipping 44 matching lines @@
     print_server_watcher_->StopWatching();
 
   // Need to kill all running jobs.
   while (!job_handler_map_.empty()) {
     JobHandlerMap::iterator index = job_handler_map_.begin();
     // Shutdown will call our OnPrinterJobHandlerShutdown method which will
     // remove this from the map.
     index->second->Shutdown();
   }
   // Important to delete the TalkMediator on this thread.
+  talk_mediator_->Logout();
   talk_mediator_.reset();
   notifications_enabled_ = false;
   notifications_enabled_since_ = base::TimeTicks();
   request_ = NULL;
 }
 
 void CloudPrintProxyBackend::Core::DoRegisterSelectedPrinters(
     const printing::PrinterList& printer_list) {
   DCHECK(MessageLoop::current() == backend_->core_thread_.message_loop());
   if (!print_system_.get())
@@ skipping 472 matching lines @@
       &Core::NotifyAuthenticationFailed));
 }
 
 void CloudPrintProxyBackend::Core::OnPrinterNotFound(
     const std::string& printer_name,
     bool* delete_from_server) {
   // If we have a complete list of local printers, then this needs to be deleted
   // from the server.
   *delete_from_server = complete_list_available_;
 }