Fixing broken Integration tests.

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 122 matching lines @@
     case WAITING_FOR_SYNC_TO_FINISH: {
       const SyncSessionSnapshot* snap = GetLastSessionSnapshot();
       DCHECK(snap) << "Should have been at least one sync session by now";
       // TODO(rsimha): In an ideal world, snap->has_more_to_sync == false should
       // be a sufficient condition for sync to have completed. However, the
       // additional check of snap->unsynced_count is required due to
       // http://crbug.com/48989.
       if (snap->has_more_to_sync || snap->unsynced_count != 0) {
         break;
       }
-
       EXPECT_LE(last_timestamp_, snap->max_local_timestamp);
       last_timestamp_ = snap->max_local_timestamp;
       SignalStateCompleteWithNextState(FULLY_SYNCED);
       break;
     }
     case WAITING_FOR_UPDATES: {
       const SyncSessionSnapshot* snap = GetLastSessionSnapshot();
       DCHECK(snap) << "Should have been at least one sync session by now";
-      if (snap->max_local_timestamp < min_timestamp_needed_)
+      if (snap->max_local_timestamp < min_timestamp_needed_) {
         break;
-
+      }
+      EXPECT_LE(last_timestamp_, snap->max_local_timestamp);
+      last_timestamp_ = snap->max_local_timestamp;
       SignalStateCompleteWithNextState(FULLY_SYNCED);
       break;
     }
     case FULLY_SYNCED:
     default:
       // Invalid state during observer callback which may be triggered by other
       // classes using the the UI message loop.  Defer to their handling.
       break;
   }
   last_status_ = status;
   return state != wait_state_;
 }
 
 void ProfileSyncServiceTestHarness::OnStateChanged() {
   RunStateChangeMachine();
 }
 
 bool ProfileSyncServiceTestHarness::AwaitSyncCycleCompletion(
     const std::string& reason) {
-  if (service()->backend()->HasUnsyncedItems()) {
+  const SyncSessionSnapshot* snap = GetLastSessionSnapshot();
+  DCHECK(snap) << "Should have been at least one sync session by now";
+  // TODO(rsimha): Remove additional checks of snap->has_more_to_sync and
+  // snap->unsynced_count once http://crbug.com/48989 is fixed.
+  if (service()->backend()->HasUnsyncedItems() ||
+      snap->has_more_to_sync ||
+      snap->unsynced_count != 0) {
     wait_state_ = WAITING_FOR_SYNC_TO_FINISH;
     return AwaitStatusChangeWithTimeout(60, reason);
   } else {
+    EXPECT_LE(last_timestamp_, snap->max_local_timestamp);
+    last_timestamp_ = snap->max_local_timestamp;
     return true;
   }
 }
 
 bool ProfileSyncServiceTestHarness::AwaitMutualSyncCycleCompletion(
     ProfileSyncServiceTestHarness* partner) {
   bool success = AwaitSyncCycleCompletion(
       "Sync cycle completion on active client.");
   if (!success)
     return false;
@@ skipping 90 matching lines @@
   }
 
   return true;
 }
 
 const SyncSessionSnapshot*
     ProfileSyncServiceTestHarness::GetLastSessionSnapshot() const {
   EXPECT_FALSE(service_ == NULL) << "Sync service has not yet been set up.";
   return service_->backend()->GetLastSessionSnapshot();
 }