Experimental functionize patch

sync/engine/sync_scheduler_impl.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/engine/sync_scheduler_impl.h"
 
 #include <algorithm>
 #include <cstring>
 
 #include "base/auto_reset.h"
@@ skipping 219 matching lines @@
   if (old_mode != mode_ &&
       mode_ == NORMAL_MODE &&
       nudge_tracker_.IsSyncRequired() &&
       CanRunNudgeJobNow(NORMAL_PRIORITY)) {
     // We just got back to normal mode.  Let's try to run the work that was
     // queued up while we were configuring.
     DoNudgeSyncSessionJob(NORMAL_PRIORITY);
   }
 }
 
+ModelTypeSet SyncSchedulerImpl::GetEnabledAndUnthrottledTypes() {
+  ModelTypeSet enabled_types =
+      GetRoutingInfoTypes(session_context_->routing_info());
+  ModelTypeSet throttled_types =
+      nudge_tracker_.GetThrottledTypes();
+  return Difference(enabled_types, throttled_types);
+}
+
 void SyncSchedulerImpl::SendInitialSnapshot() {
   DCHECK(CalledOnValidThread());
   scoped_ptr<SyncSession> dummy(
       SyncSession::Build(session_context_, this, SyncSourceInfo()));
   SyncEngineEvent event(SyncEngineEvent::STATUS_CHANGED);
   event.snapshot = dummy->TakeSnapshot();
   session_context_->NotifyListeners(event);
 }
 
 namespace {
@@ skipping 204 matching lines @@
   return "";
 }
 
 void SyncSchedulerImpl::DoNudgeSyncSessionJob(JobPriority priority) {
   DCHECK(CalledOnValidThread());
   DCHECK(CanRunNudgeJobNow(priority));
 
   DVLOG(2) << "Will run normal mode sync cycle with routing info "
            << ModelSafeRoutingInfoToString(session_context_->routing_info());
   scoped_ptr<SyncSession> session(
-      SyncSession::BuildForNudge(
+      SyncSession::Build(
           session_context_,
           this,
-          nudge_tracker_.GetSourceInfo(),
-          &nudge_tracker_));
-  bool premature_exit = !syncer_->SyncShare(session.get(),
-                                            SYNCER_BEGIN,
-                                            SYNCER_END);
+          nudge_tracker_.GetSourceInfo()));
+  bool premature_exit = !syncer_->NormalSyncShare(
+      session.get(),
+      GetEnabledAndUnthrottledTypes(),
+      nudge_tracker_);
   AdjustPolling(FORCE_RESET);
 
   bool success = !premature_exit
       && !sessions::HasSyncerError(
           session->status_controller().model_neutral_state());
 
   if (success) {
     // That cycle took care of any outstanding work we had.
     SDVLOG(2) << "Nudge succeeded.";
     nudge_tracker_.RecordSuccessfulSyncCycle();
@@ skipping 18 matching lines @@
   }
 
   SDVLOG(2) << "Will run configure SyncShare with routes "
            << ModelSafeRoutingInfoToString(session_context_->routing_info());
   SyncSourceInfo source_info(pending_configure_params_->source,
                              ModelSafeRoutingInfoToInvalidationMap(
                                  session_context_->routing_info(),
                                  std::string()));
   scoped_ptr<SyncSession> session(
       SyncSession::Build(session_context_, this, source_info));
-  bool premature_exit = !syncer_->SyncShare(session.get(),
-                                            DOWNLOAD_UPDATES,
-                                            APPLY_UPDATES);
+  bool premature_exit = !syncer_->ConfigureSyncShare(
+      session.get(),
+      GetRoutingInfoTypes(session_context_->routing_info()));
   AdjustPolling(FORCE_RESET);
 
   bool success = !premature_exit
       && !sessions::HasSyncerError(
           session->status_controller().model_neutral_state());
 
   if (success) {
     SDVLOG(2) << "Configure succeeded.";
     pending_configure_params_->ready_task.Run();
     pending_configure_params_.reset();
@@ skipping 39 matching lines @@
 
   if (mode_ != NORMAL_MODE) {
     SDVLOG(2) << "Not running poll job in configure mode.";
     return;
   }
 
   SDVLOG(2) << "Polling with routes "
            << ModelSafeRoutingInfoToString(session_context_->routing_info());
   scoped_ptr<SyncSession> session(
       SyncSession::Build(session_context_, this, info));
-  syncer_->SyncShare(session.get(), DOWNLOAD_UPDATES, APPLY_UPDATES);
+  syncer_->PollSyncShare(
+      session.get(),
+      GetEnabledAndUnthrottledTypes());
 
   AdjustPolling(UPDATE_INTERVAL);
 
   if (IsCurrentlyThrottled()) {
     SDVLOG(2) << "Poll request got us throttled.";
     // The OnSilencedUntil() call set up the WaitInterval for us.  All we need
     // to do is start the timer.
     RestartWaiting();
   }
 }
@@ skipping 304 matching lines @@
 
 #undef SDVLOG_LOC
 
 #undef SDVLOG
 
 #undef SLOG
 
 #undef ENUM_CASE
 
 }  // namespace syncer