[Recommit]

sync/protocol/proto_enum_conversions.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.
 
 // Keep this file in sync with the .proto files in this directory.
 
 #include "sync/protocol/proto_enum_conversions.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 65 matching lines @@
     ENUM_CASE(sync_pb::SyncEnums, CLIENT_REDIRECT);
     ENUM_CASE(sync_pb::SyncEnums, SERVER_REDIRECT);
   }
   NOTREACHED();
   return "";
 }
 
 const char* GetUpdatesSourceString(
     sync_pb::GetUpdatesCallerInfo::GetUpdatesSource updates_source) {
   ASSERT_ENUM_BOUNDS(sync_pb::GetUpdatesCallerInfo, GetUpdatesSource,
-                     UNKNOWN, DATATYPE_REFRESH);
+                     UNKNOWN, RETRY);
   switch (updates_source) {
     ENUM_CASE(sync_pb::GetUpdatesCallerInfo, UNKNOWN);
     ENUM_CASE(sync_pb::GetUpdatesCallerInfo, FIRST_UPDATE);
     ENUM_CASE(sync_pb::GetUpdatesCallerInfo, LOCAL);
     ENUM_CASE(sync_pb::GetUpdatesCallerInfo, NOTIFICATION);
     ENUM_CASE(sync_pb::GetUpdatesCallerInfo, PERIODIC);
     ENUM_CASE(sync_pb::GetUpdatesCallerInfo, SYNC_CYCLE_CONTINUATION);
     ENUM_CASE(sync_pb::GetUpdatesCallerInfo, NEWLY_SUPPORTED_DATATYPE);
     ENUM_CASE(sync_pb::GetUpdatesCallerInfo, MIGRATION);
     ENUM_CASE(sync_pb::GetUpdatesCallerInfo, NEW_CLIENT);
     ENUM_CASE(sync_pb::GetUpdatesCallerInfo, RECONFIGURATION);
     ENUM_CASE(sync_pb::GetUpdatesCallerInfo, DATATYPE_REFRESH);
+    ENUM_CASE(sync_pb::GetUpdatesCallerInfo, RETRY);
   }
   NOTREACHED();
   return "";
 }
 
 const char* GetUpdatesOriginString(
     sync_pb::SyncEnums::GetUpdatesOrigin origin) {
   ASSERT_ENUM_BOUNDS(sync_pb::SyncEnums, GetUpdatesOrigin,
-                     UNKNOWN_ORIGIN, GU_TRIGGER);
+                     UNKNOWN_ORIGIN, RETRY);
   switch (origin) {
     ENUM_CASE(sync_pb::SyncEnums, UNKNOWN_ORIGIN);
     ENUM_CASE(sync_pb::SyncEnums, PERIODIC);
     ENUM_CASE(sync_pb::SyncEnums, NEWLY_SUPPORTED_DATATYPE);
     ENUM_CASE(sync_pb::SyncEnums, MIGRATION);
     ENUM_CASE(sync_pb::SyncEnums, NEW_CLIENT);
     ENUM_CASE(sync_pb::SyncEnums, RECONFIGURATION);
     ENUM_CASE(sync_pb::SyncEnums, GU_TRIGGER);
+    ENUM_CASE(sync_pb::SyncEnums, RETRY);
   }
   NOTREACHED();
   return "";
 }
 
 const char* GetResponseTypeString(
     sync_pb::CommitResponse::ResponseType response_type) {
   ASSERT_ENUM_BOUNDS(sync_pb::CommitResponse, ResponseType, SUCCESS,
                      TRANSIENT_ERROR);
   switch (response_type) {
@@ skipping 129 matching lines @@
     ENUM_CASE(sync_pb::TabNavigation, STATE_BLOCKED);
   }
   NOTREACHED();
   return "";
 }
 
 #undef ASSERT_ENUM_BOUNDS
 #undef ENUM_CASE
 
 }  // namespace syncer