Sync: Remove pthreads from auth_watcher.

chrome/browser/sync/engine/syncapi.cc

 // Copyright (c) 2006-2009 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/browser/sync/engine/syncapi.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ skipping 864 matching lines @@
 
   // A multi-purpose status watch object that aggregates stats from various
   // sync components.
   AllStatus allstatus_;
 
   // AuthWatcher kicks off the authentication process and follows it through
   // phase 1 (GAIA) to phase 2 (sync engine). As part of this work it determines
   // the initial connectivity and causes the server connection event to be
   // broadcast, which signals the syncer thread to start syncing.
   // It has a heavy duty constructor requiring boilerplate so we heap allocate.
-  scoped_ptr<AuthWatcher> auth_watcher_;
+  scoped_refptr<AuthWatcher> auth_watcher_;
 
   // A store of change records produced by HandleChangeEvent during the
   // CALCULATE_CHANGES step, and to be processed, and forwarded to the
   // observer, by HandleChangeEvent during the TRANSACTION_COMPLETE step.
   ChangeReorderBuffer change_buffer_;
 
   // The event listener hookup that is registered for HandleChangeEvent.
   scoped_ptr<EventListenerHookup> dir_change_hookup_;
 
   // The event listener hookup registered for HandleSyncerEvent.
@@ skipping 130 matching lines @@
   std::string gaia_url = browser_sync::kGaiaUrl;
   const char* service_id = gaia_service_id ?
       gaia_service_id : SYNC_SERVICE_NAME;
 
   talk_mediator_.reset(new TalkMediatorImpl());
   allstatus()->WatchTalkMediator(talk_mediator());
 
   BridgedGaiaAuthenticator* gaia_auth = new BridgedGaiaAuthenticator(
       gaia_source, service_id, gaia_url, auth_post_factory);
 
-  auth_watcher_.reset(new AuthWatcher(dir_manager(),
-                                      connection_manager(),
-                                      &allstatus_,
-                                      gaia_source,
-                                      service_id,
-                                      gaia_url,
-                                      user_settings_.get(),
-                                      gaia_auth,
-                                      talk_mediator()));
+  auth_watcher_ = new AuthWatcher(dir_manager(),
+                                  connection_manager(),
+                                  &allstatus_,
+                                  gaia_source,
+                                  service_id,
+                                  gaia_url,
+                                  user_settings_.get(),
+                                  gaia_auth,
+                                  talk_mediator());
 
   talk_mediator()->WatchAuthWatcher(auth_watcher());
   allstatus()->WatchAuthWatcher(auth_watcher());
   authwatcher_hookup_.reset(NewEventListenerHookup(auth_watcher_->channel(),
       this, &SyncInternal::HandleAuthWatcherEvent));
 
   // Tell the SyncerThread to use the ModelSafeWorker for bookmark model work.
   // We set up both sides of the "bridge" here, with the ModelSafeWorkerBridge
   // on the Syncer side, and |model_safe_worker| on the API client side.
   ModelSafeWorkerBridge* worker = new ModelSafeWorkerBridge(model_safe_worker);
@@ skipping 110 matching lines @@
 
 void SyncManager::Shutdown() {
   data_->Shutdown();
 }
 
 void SyncManager::SyncInternal::Shutdown() {
   // First reset the AuthWatcher in case an auth attempt is in progress so that
   // it terminates gracefully before we shutdown and close other components.
   // Otherwise the attempt can complete after we've closed the directory, for
   // example, and cause initialization to continue, which is bad.
-  auth_watcher_.reset();
+  auth_watcher_->Shutdown();
+  auth_watcher_ = NULL;
 
   if (syncer_thread()) {
     if (!syncer_thread()->Stop(kThreadExitTimeoutMsec))
       DCHECK(false) << "Unable to stop the syncer, it won't be happy...";
   }
 
   // Shutdown the xmpp buzz connection.
   LOG(INFO) << "P2P: Mediator logout started.";
   if (talk_mediator()) {
     talk_mediator()->Logout();
@@ skipping 364 matching lines @@
 BaseTransaction::~BaseTransaction() {
   delete lookup_;
 }
 
 UserShare* SyncManager::GetUserShare() const {
   DCHECK(data_->initialized()) << "GetUserShare requires initialization!";
   return data_->GetUserShare();
 }
 
 }  // namespace sync_api