Fix compiling of sync on linux.

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 32 matching lines @@
 
 AuthWatcher::AuthWatcher(DirectoryManager* dirman,
                          ServerConnectionManager* scm,
                          AllStatus* allstatus,
                          const string& user_agent,
                          const string& service_id,
                          const string& gaia_url,
                          UserSettings* user_settings,
                          GaiaAuthenticator* gaia_auth,
                          TalkMediator* talk_mediator)
-    : dirman_(dirman),
+    : gaia_(gaia_auth),
+      dirman_(dirman),
       scm_(scm),
       allstatus_(allstatus),
       status_(NOT_AUTHENTICATED),
+      user_settings_(user_settings),
+      talk_mediator_(talk_mediator),
       thread_handle_valid_(false),
       authenticating_now_(false),
-      current_attempt_trigger_(AuthWatcherEvent::USER_INITIATED),
-      user_settings_(user_settings),
-      gaia_(gaia_auth),
-      talk_mediator_(talk_mediator) {
+      current_attempt_trigger_(AuthWatcherEvent::USER_INITIATED) {
   connmgr_hookup_.reset(
       NewEventListenerHookup(scm->channel(), this,
                              &AuthWatcher::HandleServerConnectionEvent));
   AuthWatcherEvent done = { AuthWatcherEvent::AUTHWATCHER_DESTROYED };
   channel_.reset(new Channel(done));
 }
 
 void* AuthWatcher::AuthenticationThreadStartRoutine(void* arg) {
   ThreadParams* args = reinterpret_cast<ThreadParams*>(arg);
   return args->self->AuthenticationThreadMain(args);
@@ skipping 110 matching lines @@
     if (AuthWatcherEvent::SERVICE_CONNECTION_FAILED == event.what_happened)
       return true;
   }
   CHECK(event.what_happened != AuthWatcherEvent::ILLEGAL_VALUE);
   NotifyListeners(&event);
   return true;
 }
 
 bool AuthWatcher::AuthenticateLocally(string email) {
   user_settings_->GetEmailForSignin(&email);
-  if (file_util::PathExists(dirman_->GetSyncDataDatabasePath())) {
+  if (file_util::PathExists(FilePath(dirman_->GetSyncDataDatabasePath()))) {
     gaia_->SetUsername(email);
     status_ = LOCALLY_AUTHENTICATED;
     user_settings_->SwitchUser(email);
     PathString share_name;
     CHECK(AppendUTF8ToPathString(email.data(), email.size(), &share_name));
     LoadDirectoryListAndOpen(share_name);
     NotifyAuthSucceeded(email);
     return true;
   } else {
     return false;
@@ skipping 206 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