Sync: Remove pthreads from event_sys code. Remove asynch version of GaiaAuthe...

chrome/browser/sync/engine/auth_watcher.h

 // 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.
 //
 // AuthWatcher watches authentication events and user open and close
 // events and accordingly opens and closes shares.
 
 #ifndef CHROME_BROWSER_SYNC_ENGINE_AUTH_WATCHER_H_
 #define CHROME_BROWSER_SYNC_ENGINE_AUTH_WATCHER_H_
 
@@ skipping 69 matching lines @@
               const std::string& gaia_url,
               UserSettings* user_settings,
               GaiaAuthenticator* gaia_auth,
               TalkMediator* talk_mediator);
   ~AuthWatcher();
 
   // Returns true if the open share has gotten zero updates from the sync
   // server (initial sync complete).
   bool LoadDirectoryListAndOpen(const PathString& login);
 
-  typedef EventChannel<AuthWatcherEvent, PThreadMutex> Channel;
+  typedef EventChannel<AuthWatcherEvent, Lock> Channel;
 
   inline Channel* channel() const {
     return channel_.get();
   }
 
   void Authenticate(const std::string& email, const std::string& password,
       const std::string& captcha_token, const std::string& captcha_value,
       bool persist_creds_to_disk);
 
   void Authenticate(const std::string& email, const std::string& password,
@@ skipping 72 matching lines @@
   // Member function called by AuthenticationThreadStartRoutine.
   void* AuthenticationThreadMain(struct ThreadParams* arg);
 
   scoped_ptr<GaiaAuthenticator> const gaia_;
   syncable::DirectoryManager* const dirman_;
   ServerConnectionManager* const scm_;
   scoped_ptr<EventListenerHookup> connmgr_hookup_;
   AllStatus* const allstatus_;
   // TODO(chron): It is incorrect to make assignments to AtomicWord.
   volatile base::subtle::AtomicWord status_;
-  UserSettings* user_settings_;
+  UserSettings* const user_settings_;
   TalkMediator* talk_mediator_;  // Interface to the notifications engine.
   scoped_ptr<Channel> channel_;
 
   // We store our service token in memory as a workaround to the fact that we
   // don't persist it when the user unchecks "remember me".
   // We also include it on outgoing requests.
   std::string sync_service_token_;
 
   PThreadMutex mutex_;
   // All members below are protected by the above mutex
   pthread_t thread_;
   bool thread_handle_valid_;
   bool authenticating_now_;
   AuthWatcherEvent::AuthenticationTrigger current_attempt_trigger_;
   DISALLOW_COPY_AND_ASSIGN(AuthWatcher);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_ENGINE_AUTH_WATCHER_H_