Error reporting for sync setup failure.

chrome/test/live_sync/live_sync_test.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 "chrome/test/live_sync/live_sync_test.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/path_service.h"
@@ skipping 112 matching lines @@
 
 bool LiveSyncTest::SetupClients() {
   EXPECT_GT(num_clients_, 0) << "num_clients_ incorrectly initialized.";
   EXPECT_TRUE(profiles_.empty()) << "SetupClients() has already been called.";
   EXPECT_TRUE(clients_.empty()) << "SetupClients() has already been called.";
 
   // Create the required number of sync profiles and clients.
   for (int i = 0; i < num_clients_; ++i) {
     profiles_.push_back(MakeProfile(
         StringPrintf(FILE_PATH_LITERAL("Profile%d"), i)));
-    if (GetProfile(i) == NULL)
-      return false;
+    EXPECT_FALSE(GetProfile(i) == NULL) << "GetProfile(" << i << ") failed.";
     clients_.push_back(new ProfileSyncServiceTestHarness(
         GetProfile(i), username_, password_));
-    if (GetClient(i) == NULL)
-      return false;
+    EXPECT_FALSE(GetClient(i) == NULL) << "GetClient(" << i << ") failed.";
   }
 
   // Create the verifier profile.
   verifier_.reset(MakeProfile(FILE_PATH_LITERAL("Verifier")));
   return (verifier_.get() != NULL);
 }
 
 bool LiveSyncTest::SetupSync() {
   // Create sync profiles and clients if they haven't already been created.
   if (profiles_.empty()) {
-    if (!SetupClients())
-      return false;
+    EXPECT_TRUE(SetupClients()) << "SetupClients() failed.";
   }
 
   // Sync each of the profiles.
   for (int i = 0; i < num_clients_; ++i) {
-    if (!GetClient(i)->SetupSync())
-      return false;
+    EXPECT_TRUE(GetClient(i)->SetupSync()) << "SetupSync() failed.";
   }
+
   return true;
 }
 
 void LiveSyncTest::CleanUpOnMainThread() {
   profiles_.reset();
   clients_.reset();
   verifier_.reset(NULL);
 }
 
 void LiveSyncTest::SetUpInProcessBrowserTestFixture() {
@@ skipping 26 matching lines @@
   CommandLine* cl = CommandLine::ForCurrentProcess();
   cl->AppendSwitchASCII(switches::kSyncServiceURL,
       StringPrintf("http://%s:%d/chromiumsync", server_.kHostName,
                    server_.kOKHTTPSPort));
 }
 
 void LiveSyncTest::TearDownLocalTestServer() {
   bool success = server_.Stop();
   ASSERT_TRUE(success);
 }