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

chrome/browser/sync/engine/auth_watcher.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/auth_watcher.h"
 
 #include "base/file_util.h"
 #include "base/string_util.h"
 #include "chrome/browser/sync/engine/all_status.h"
 #include "chrome/browser/sync/engine/authenticator.h"
@@ skipping 218 matching lines @@
                              ServiceUnavailable == results.auth_error;
     if (unavailable)
       return;
   }
   AuthWatcherEvent myevent = { AuthWatcherEvent::GAIA_AUTH_FAILED, &results };
   NotifyListeners(&myevent);
 }
 
 void* AuthWatcher::AuthenticationThreadMain(ThreadParams* args) {
   NameCurrentThreadForDebugging("SyncEngine_AuthWatcherThread");
+  // TODO(timsteele):  Remove this; this is temporary to satisfy code that
+  // compares MessageLoop pointers until AuthWatcher uses a base::Thread.
+  // We allocate a message_loop from the AuthWatcherThread so that
+  // GaiaAuth and EventChannel get a valid opaque pointer to the current
+  // message loop used for comparison. It gets stored in TLS as the 'current'
+  // loop for this thread.
+  MessageLoop message_loop;
   {
     // This short lock ensures our launching function (StartNewAuthAttempt) is
     // done.
     MutexLock lock(&mutex_);
     current_attempt_trigger_ = args->trigger;
   }
   SaveCredentials save = args->persist_creds_to_disk ?
       PERSIST_TO_DISK : SAVE_IN_MEMORY_ONLY;
   int attempt = 0;
   SignIn const signin = user_settings_->
     RecallSigninType(args->email, GMAIL_SIGNIN);
 
-  if (!args->password.empty()) while (true) {
-    bool authenticated;
-    if (!args->captcha_token.empty() && !args->captcha_value.empty())
-      authenticated = gaia_->Authenticate(args->email, args->password,
-                                          save, true, args->captcha_token,
-                                          args->captcha_value, signin);
-    else
-      authenticated = gaia_->Authenticate(args->email, args->password,
-                                          save, true, signin);
-    if (authenticated) {
-      if (!ProcessGaiaAuthSuccess()) {
-        if (3 != ++attempt)
-          continue;
-        AuthWatcherEvent event =
-            { AuthWatcherEvent::SERVICE_CONNECTION_FAILED, 0 };
-        NotifyListeners(&event);
+  gaia_->set_message_loop(&message_loop);
+
+  if (!args->password.empty()) {
+    // TODO(timsteele): Split this mess up into functions.
+    while (true) {
+      bool authenticated;
+      if (!args->captcha_token.empty() && !args->captcha_value.empty()) {
+        authenticated = gaia_->Authenticate(args->email, args->password,
+                                            save, args->captcha_token,
+                                            args->captcha_value, signin);
+      } else {
+        authenticated = gaia_->Authenticate(args->email, args->password,
+                                            save, signin);
       }
-    } else {
-      ProcessGaiaAuthFailure();
+      if (authenticated) {
+        if (!ProcessGaiaAuthSuccess()) {
+            if (3 != ++attempt) {
+              continue;
+            }
+          AuthWatcherEvent event =
+              { AuthWatcherEvent::SERVICE_CONNECTION_FAILED, 0 };
+          NotifyListeners(&event);
+        }
+      } else {
+        ProcessGaiaAuthFailure();
+      }
+      break;  // We are done trying to authenticate.
     }
-    break;
   } else if (!args->auth_token.empty()) {
     AuthenticateWithToken(args->email, args->auth_token);
   } else {
     LOG(ERROR) << "Attempt to authenticate with no credentials.";
   }
+
+  // We're done trying to authenticate.  Set state and terminate the thread.
   {
     MutexLock lock(&mutex_);
     authenticating_now_ = false;
   }
+  // TODO(timsteele): Remove this; nothing ever gets posted to this loop.
+  gaia_->set_message_loop(NULL);
   delete args;
   return 0;
 }
 
 void AuthWatcher::Reset() {
   status_ = NOT_AUTHENTICATED;
 }
 
 void AuthWatcher::NotifyAuthSucceeded(const string& email) {
   LOG(INFO) << "NotifyAuthSucceeded";
@@ skipping 119 matching lines @@
 string AuthWatcher::email() const {
   return gaia_->email();
 }
 
 void AuthWatcher::NotifyListeners(AuthWatcherEvent* event) {
   event->trigger = current_attempt_trigger_;
   channel_->NotifyListeners(*event);
 }
 
 }  // namespace browser_sync