Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: sync/internal_api/js_sync_manager_observer_unittest.cc

Issue 11052007: Rename ModelType/ObjectIdStateMap to InvalidationMap. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« sync/engine/syncer_unittest.cc ('K') | « sync/internal_api/debug_info_event_listener.cc ('k') | sync/internal_api/public/base/invalidation.h » ('j') | sync/internal_api/public/base/invalidation_test_util.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "sync/internal_api/js_sync_manager_observer.h" 5 #include "sync/internal_api/js_sync_manager_observer.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 EXPECT_CALL(mock_js_event_handler_, 65 EXPECT_CALL(mock_js_event_handler_,
66 HandleJsEvent("onInitializationComplete", 66 HandleJsEvent("onInitializationComplete",
67 HasDetailsAsDictionary(expected_details))); 67 HasDetailsAsDictionary(expected_details)));
68 68
69 js_sync_manager_observer_.OnInitializationComplete( 69 js_sync_manager_observer_.OnInitializationComplete(
70 WeakHandle<JsBackend>(), true, restored_types); 70 WeakHandle<JsBackend>(), true, restored_types);
71 PumpLoop(); 71 PumpLoop();
72 } 72 }
73 73
74 TEST_F(JsSyncManagerObserverTest, OnSyncCycleCompleted) { 74 TEST_F(JsSyncManagerObserverTest, OnSyncCycleCompleted) {
75 ModelTypeStateMap download_progress_markers; 75 ModelTypeInvalidationMap download_progress_markers;
76 sessions::SyncSessionSnapshot snapshot(sessions::ModelNeutralState(), 76 sessions::SyncSessionSnapshot snapshot(sessions::ModelNeutralState(),
77 false, 77 false,
78 ModelTypeSet(), 78 ModelTypeSet(),
79 download_progress_markers, 79 download_progress_markers,
80 false, 80 false,
81 true, 81 true,
82 8, 82 8,
83 5, 83 5,
84 2, 84 2,
85 7, 85 7,
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 EXPECT_CALL(mock_js_event_handler_, 138 EXPECT_CALL(mock_js_event_handler_,
139 HandleJsEvent("onUpdatedToken", 139 HandleJsEvent("onUpdatedToken",
140 HasDetailsAsDictionary(redacted_token_details))); 140 HasDetailsAsDictionary(redacted_token_details)));
141 141
142 js_sync_manager_observer_.OnUpdatedToken("sensitive_token"); 142 js_sync_manager_observer_.OnUpdatedToken("sensitive_token");
143 PumpLoop(); 143 PumpLoop();
144 } 144 }
145 145
146 } // namespace 146 } // namespace
147 } // namespace syncer 147 } // namespace syncer
OLDNEW
« sync/engine/syncer_unittest.cc ('K') | « sync/internal_api/debug_info_event_listener.cc ('k') | sync/internal_api/public/base/invalidation.h » ('j') | sync/internal_api/public/base/invalidation_test_util.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698