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

Unified Diff: chrome/browser/sync/engine/download_updates_command.cc

Issue 8638001: [Sync] Made some sync session member functions const (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix latent bug in StatusController Created 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/engine/download_updates_command.cc
diff --git a/chrome/browser/sync/engine/download_updates_command.cc b/chrome/browser/sync/engine/download_updates_command.cc
index 5ca2290e1c6b7c15b7b4ef84a1cc1f0a39559d6e..2d573d84ef7410c9a60b9ab8bbebda034657ddfa 100644
--- a/chrome/browser/sync/engine/download_updates_command.cc
+++ b/chrome/browser/sync/engine/download_updates_command.cc
@@ -97,7 +97,7 @@ void DownloadUpdatesCommand::ExecuteImpl(SyncSession* session) {
VLOG(2) << SyncerProtoUtil::ClientToServerResponseDebugString(
update_response);
- StatusController* status = session->status_controller();
+ StatusController* status = session->mutable_status_controller();
status->set_updates_request_types(enabled_types);
if (!ok) {
status->increment_num_consecutive_errors();
@@ -115,36 +115,19 @@ void DownloadUpdatesCommand::ExecuteImpl(SyncSession* session) {
<< " updates left on server.";
}
-void DownloadUpdatesCommand::SetRequestedTypes(
- const syncable::ModelTypeBitSet& target_datatypes,
- sync_pb::EntitySpecifics* filter_protobuf) {
- // The datatypes which should be synced are dictated by the value of the
- // ModelSafeRoutingInfo. If a datatype is in the routing info map, it
- // should be synced (even if it's GROUP_PASSIVE).
- int requested_type_count = 0;
- for (int i = FIRST_REAL_MODEL_TYPE; i < MODEL_TYPE_COUNT; ++i) {
- if (target_datatypes[i]) {
- requested_type_count++;
- syncable::AddDefaultExtensionValue(syncable::ModelTypeFromInt(i),
- filter_protobuf);
- }
- }
- DCHECK_LT(0, requested_type_count) << "Doing GetUpdates with empty filter.";
-}
-
void DownloadUpdatesCommand::AppendClientDebugInfoIfNeeded(
sessions::SyncSession* session,
DebugInfo* debug_info) {
// We want to send the debug info only once per sync cycle. Check if it has
// already been sent.
- if (!session->status_controller()->debug_info_sent()) {
+ if (!session->status_controller().debug_info_sent()) {
VLOG(1) << "Sending client debug info ...";
// could be null in some unit tests.
if (session->context()->debug_info_getter()) {
session->context()->debug_info_getter()->GetAndClearDebugInfo(
debug_info);
}
- session->status_controller()->set_debug_info_sent();
+ session->mutable_status_controller()->set_debug_info_sent();
}
}
« no previous file with comments | « chrome/browser/sync/engine/download_updates_command.h ('k') | chrome/browser/sync/engine/download_updates_command_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698