Error reporting for sync setup failure.

chrome/test/live_sync/profile_sync_service_test_harness.cc

 // Copyright (c) 2010 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 "base/message_loop.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
 #include "chrome/browser/sync/sessions/session_state.h"
@@ skipping 241 matching lines @@
       NewRunnableMethod(timeout_signal.get(),
                         &StateChangeTimeoutEvent::Callback),
       1000 * timeout_seconds);
   ui_test_utils::RunMessageLoop();
   return timeout_signal->Abort();
 }
 
 bool ProfileSyncServiceTestHarness::WaitForServiceInit() {
   // Wait for the OnAuthError() callback.
   EXPECT_EQ(wait_state_, WAITING_FOR_ON_AUTH_ERROR);
-  if (!AwaitStatusChangeWithTimeout(30,
-      "Waiting for the OnAuthError() callback.")) {
-    return false;
-  }
+  EXPECT_TRUE(AwaitStatusChangeWithTimeout(30,
+      "Waiting for the OnAuthError() callback.")) <<
+      "OnAuthError() not seen after 30 seconds.";
 
   // Enter GAIA credentials and wait for the OnBackendInitialized() callback.
   service_->backend()->Authenticate(username_, password_, std::string());
   EXPECT_EQ(wait_state_, WAITING_FOR_ON_BACKEND_INITIALIZED);
-  if (!AwaitStatusChangeWithTimeout(30,
-      "Waiting for OnBackendInitialized().")) {
-    return false;
-  }
+  EXPECT_TRUE(AwaitStatusChangeWithTimeout(30,
+      "Waiting for OnBackendInitialized().")) <<
+      "OnBackendInitialized() not seen after 30 seconds.";
 
   // Choose datatypes to be synced and wait for notifications_enabled to be set
   // to true.
   syncable::ModelTypeSet set;
   for (int i = syncable::FIRST_REAL_MODEL_TYPE;
       i < syncable::MODEL_TYPE_COUNT; ++i) {
     set.insert(syncable::ModelTypeFromInt(i));
   }
   service_->OnUserChoseDatatypes(true, set);
   EXPECT_EQ(wait_state_, WAITING_FOR_NOTIFICATIONS_ENABLED);
-  if (!AwaitStatusChangeWithTimeout(30,
-      "Waiting for notifications_enabled to be set to true.")) {
-    return false;
-  }
+  EXPECT_TRUE(AwaitStatusChangeWithTimeout(30,
+      "Waiting for notifications_enabled to be set to true.")) <<
+      "notifications_enabled not set to true after 30 seconds.";
 
   return true;
 }
 
 const SyncSessionSnapshot*
     ProfileSyncServiceTestHarness::GetLastSessionSnapshot() const {
   EXPECT_FALSE(service_ == NULL) << "Sync service has not yet been set up.";
   return service_->backend()->GetLastSessionSnapshot();
 }