Avoid useless SYNC_CYCLE_CONTINUATION sync cycle

chrome/browser/sync/engine/download_updates_command.cc

 // Copyright (c) 2011 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 "chrome/browser/sync/engine/download_updates_command.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "chrome/browser/sync/engine/syncer.h"
@@ skipping 12 matching lines @@
 using sessions::SyncSession;
 using std::string;
 using syncable::FIRST_REAL_MODEL_TYPE;
 using syncable::MODEL_TYPE_COUNT;
 using syncable::ModelTypeSet;
 using syncable::ModelTypeSetToString;
 
 DownloadUpdatesCommand::DownloadUpdatesCommand() {}
 DownloadUpdatesCommand::~DownloadUpdatesCommand() {}
 
-void DownloadUpdatesCommand::ExecuteImpl(SyncSession* session) {
+SyncerError DownloadUpdatesCommand::ExecuteImpl(SyncSession* session) {
   ClientToServerMessage client_to_server_message;
   ClientToServerResponse update_response;
 
   client_to_server_message.set_share(session->context()->account_name());
   client_to_server_message.set_message_contents(
       ClientToServerMessage::GET_UPDATES);
   GetUpdatesMessage* get_updates =
       client_to_server_message.mutable_get_updates();
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kCreateMobileBookmarksFolder)) {
     get_updates->set_include_syncable_bookmarks(true);
   }
 
   ScopedDirLookup dir(session->context()->directory_manager(),
                       session->context()->account_name());
   if (!dir.good()) {
     LOG(ERROR) << "Scoped dir lookup failed!";
-    return;
+    return DIRECTORY_LOOKUP_FAILED;
   }
 
   // Request updates for all enabled types.
   const ModelTypeSet enabled_types =
       GetRoutingInfoTypes(session->routing_info());
   DVLOG(1) << "Getting updates for types "
            << ModelTypeSetToString(enabled_types);
   DCHECK(!enabled_types.Empty());
 
   const syncable::ModelTypePayloadMap& type_payload_map =
@@ skipping 22 matching lines @@
       session->TestAndSetSource().updates_source);
   get_updates->mutable_caller_info()->set_notifications_enabled(
       session->context()->notifications_enabled());
 
   SyncerProtoUtil::AddRequestBirthday(dir, &client_to_server_message);
 
   DebugInfo* debug_info = client_to_server_message.mutable_debug_info();
 
   AppendClientDebugInfoIfNeeded(session, debug_info);
 
-  bool ok = SyncerProtoUtil::PostClientToServerMessage(
+  SyncerError result = SyncerProtoUtil::PostClientToServerMessage(
       client_to_server_message,
       &update_response,
       session);
 
   DVLOG(2) << SyncerProtoUtil::ClientToServerResponseDebugString(
       update_response);
 
   StatusController* status = session->mutable_status_controller();
   status->set_updates_request_types(enabled_types);
-  if (!ok) {
+  if (result != NO_ERROR) {
     status->increment_num_consecutive_errors();
     status->mutable_updates_response()->Clear();
     LOG(ERROR) << "PostClientToServerMessage() failed during GetUpdates";
-    return;
+    return result;
   }
 
   status->mutable_updates_response()->CopyFrom(update_response);
 
   DVLOG(1) << "GetUpdates "
            << " returned " << update_response.get_updates().entries_size()
            << " updates and indicated "
            << update_response.get_updates().changes_remaining()
            << " updates left on server.";
+  return result;
 }
 
 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()) {
     DVLOG(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->mutable_status_controller()->set_debug_info_sent();
   }
 }
 
 
 }  // namespace browser_sync