Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

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 58 matching lines @@
   EXPECT_CALL(mock_js_event_handler_,
               HandleJsEvent("onInitializationComplete",
                             HasDetailsAsDictionary(expected_details)));
 
   js_sync_manager_observer_.OnInitializationComplete(
       WeakHandle<JsBackend>(), true, restored_types);
   PumpLoop();
 }
 
 TEST_F(JsSyncManagerObserverTest, OnSyncCycleCompleted) {
-  ModelTypePayloadMap download_progress_markers;
+  ModelTypeStateMap download_progress_markers;
   sessions::SyncSessionSnapshot snapshot(sessions::ModelNeutralState(),
                                          false,
                                          ModelTypeSet(),
                                          download_progress_markers,
                                          false,
                                          true,
                                          8,
                                          5,
                                          2,
                                          7,
@@ skipping 119 matching lines @@
               HandleJsEvent("onEncryptedTypesChanged",
                             HasDetailsAsDictionary(expected_details)));
 
   js_sync_manager_observer_.OnEncryptedTypesChanged(
       encrypted_types, encrypt_everything);
   PumpLoop();
 }
 
 }  // namespace
 }  // namespace syncer