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

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

Issue 11342008: Revert 164565 - sync: make scheduling logic and job ownership more obvious. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1311/src/
Patch Set: Created 8 years, 1 month 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
« no previous file with comments | « sync/engine/syncer_unittest.cc ('k') | sync/internal_api/public/sessions/model_neutral_state.h » ('j') | no next file with comments »
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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 ProgressMarkerMap(), 78 ProgressMarkerMap(),
79 false, 79 false,
80 true, 80 true,
81 8, 81 8,
82 5, 82 5,
83 2, 83 2,
84 7, 84 7,
85 sessions::SyncSourceInfo(), 85 sessions::SyncSourceInfo(),
86 false, 86 false,
87 0, 87 0,
88 base::Time::Now()); 88 base::Time::Now(),
89 false);
89 DictionaryValue expected_details; 90 DictionaryValue expected_details;
90 expected_details.Set("snapshot", snapshot.ToValue()); 91 expected_details.Set("snapshot", snapshot.ToValue());
91 92
92 EXPECT_CALL(mock_js_event_handler_, 93 EXPECT_CALL(mock_js_event_handler_,
93 HandleJsEvent("onSyncCycleCompleted", 94 HandleJsEvent("onSyncCycleCompleted",
94 HasDetailsAsDictionary(expected_details))); 95 HasDetailsAsDictionary(expected_details)));
95 96
96 js_sync_manager_observer_.OnSyncCycleCompleted(snapshot); 97 js_sync_manager_observer_.OnSyncCycleCompleted(snapshot);
97 PumpLoop(); 98 PumpLoop();
98 } 99 }
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 EXPECT_CALL(mock_js_event_handler_, 137 EXPECT_CALL(mock_js_event_handler_,
137 HandleJsEvent("onUpdatedToken", 138 HandleJsEvent("onUpdatedToken",
138 HasDetailsAsDictionary(redacted_token_details))); 139 HasDetailsAsDictionary(redacted_token_details)));
139 140
140 js_sync_manager_observer_.OnUpdatedToken("sensitive_token"); 141 js_sync_manager_observer_.OnUpdatedToken("sensitive_token");
141 PumpLoop(); 142 PumpLoop();
142 } 143 }
143 144
144 } // namespace 145 } // namespace
145 } // namespace syncer 146 } // namespace syncer
OLDNEW
« no previous file with comments | « sync/engine/syncer_unittest.cc ('k') | sync/internal_api/public/sessions/model_neutral_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698