FYI: Move conflict resolve + clean up afterwards

sync/internal_api/js_sync_manager_observer_unittest.cc

 // Copyright (c) 2012 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 "sync/internal_api/js_sync_manager_observer.h"
 
 #include "base/basictypes.h"
 #include "base/location.h"
 #include "base/message_loop.h"
 #include "base/values.h"
@@ skipping 59 matching lines @@
       WeakHandle<JsBackend>(), true, restored_types);
   PumpLoop();
 }
 
 TEST_F(JsSyncManagerObserverTest, OnSyncCycleCompleted) {
   sessions::SyncSessionSnapshot snapshot(sessions::ModelNeutralState(),
                                          false,
                                          ModelTypeSet(),
                                          ProgressMarkerMap(),
                                          false,
-                                         true,
-                                         8,
                                          5,
                                          2,
                                          7,
                                          sessions::SyncSourceInfo(),
                                          false,
                                          0,
                                          base::Time::Now(),
                                          false);
   DictionaryValue expected_details;
   expected_details.Set("snapshot", snapshot.ToValue());
 
   EXPECT_CALL(mock_js_event_handler_,
               HandleJsEvent("onSyncCycleCompleted",
-                           HasDetailsAsDictionary(expected_details)));
+                            HasDetailsAsDictionary(expected_details)));
 
   js_sync_manager_observer_.OnSyncCycleCompleted(snapshot);
   PumpLoop();
 }
 
 TEST_F(JsSyncManagerObserverTest, OnActionableError) {
   SyncProtocolError sync_error;
   sync_error.action = CLEAR_USER_DATA_AND_RESYNC;
   sync_error.error_type = TRANSIENT_ERROR;
   DictionaryValue expected_details;
@@ skipping 31 matching lines @@
   EXPECT_CALL(mock_js_event_handler_,
               HandleJsEvent("onUpdatedToken",
                            HasDetailsAsDictionary(redacted_token_details)));
 
   js_sync_manager_observer_.OnUpdatedToken("sensitive_token");
   PumpLoop();
 }
 
 }  // namespace
 }  // namespace syncer