sync: Remove ClearUserData command.

BUG=131336
TEST=none

Review URL: https://chromiumcodereview.appspot.com/10584019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143088 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 14 insertions, 14 deletions

diff --git a/sync/protocol/get_updates_caller_info.proto b/sync/protocol/get_updates_caller_info.proto
index 41ad2ef..c921a8d 100644
--- a/sync/protocol/get_updates_caller_info.proto
+++ b/sync/protocol/get_updates_caller_info.proto
@@ -19,7 +19,10 @@ message GetUpdatesCallerInfo {
     PERIODIC = 4;  // The source of the update was periodic polling.
     SYNC_CYCLE_CONTINUATION = 5;  // The source of the update was a
                                   // continuation of a previous update.
-    CLEAR_PRIVATE_DATA = 6;       // Source is a call to remove all private data
+
+    // This value is deprecated and was never used in production.
+    // CLEAR_PRIVATE_DATA = 6;
+
     NEWLY_SUPPORTED_DATATYPE = 7;   // The client is in configuration mode
                                     // because it's syncing all datatypes, and
                                     // support for a new datatype was recently
diff --git a/sync/protocol/proto_enum_conversions.cc b/sync/protocol/proto_enum_conversions.cc
index 864f052..7c6433e 100644
--- a/sync/protocol/proto_enum_conversions.cc
+++ b/sync/protocol/proto_enum_conversions.cc
@@ -79,7 +79,6 @@ const char* GetUpdatesSourceString(
     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, CLEAR_PRIVATE_DATA);
     ENUM_CASE(sync_pb::GetUpdatesCallerInfo, NEWLY_SUPPORTED_DATATYPE);
     ENUM_CASE(sync_pb::GetUpdatesCallerInfo, MIGRATION);
     ENUM_CASE(sync_pb::GetUpdatesCallerInfo, NEW_CLIENT);
diff --git a/sync/protocol/proto_enum_conversions_unittest.cc b/sync/protocol/proto_enum_conversions_unittest.cc
index d007348..5fa53b2 100644
--- a/sync/protocol/proto_enum_conversions_unittest.cc
+++ b/sync/protocol/proto_enum_conversions_unittest.cc
@@ -55,6 +55,10 @@ TEST_F(ProtoEnumConversionsTest, GetUpdatesSourceString) {
   TestEnumStringFunction(
       GetUpdatesSourceString,
       sync_pb::GetUpdatesCallerInfo::GetUpdatesSource_MIN,
+      sync_pb::GetUpdatesCallerInfo::SYNC_CYCLE_CONTINUATION);
+  TestEnumStringFunction(
+      GetUpdatesSourceString,
+      sync_pb::GetUpdatesCallerInfo::NEWLY_SUPPORTED_DATATYPE,
       sync_pb::GetUpdatesCallerInfo::GetUpdatesSource_MAX);
 }
 
diff --git a/sync/protocol/sync.proto b/sync/protocol/sync.proto
index e2dde54..ec9a1d2 100644
--- a/sync/protocol/sync.proto
+++ b/sync/protocol/sync.proto
@@ -455,15 +455,6 @@ message AuthenticateMessage {
   required string auth_token = 1;
 };
 
-// This message is sent to the server to clear data.  An asynchronous
-// response is returned to the client indicating that the server has received
-// the request and has begun to clear data.
-message ClearUserDataMessage {
-}
-
-message ClearUserDataResponse {
-}
-
 message ClientToServerMessage {
   required string share = 1;
   optional int32 protocol_version = 2 [default = 31];
@@ -478,8 +469,10 @@ message ClientToServerMessage {
   optional CommitMessage commit = 4;
   optional GetUpdatesMessage get_updates = 5;
   optional AuthenticateMessage authenticate = 6;
-  // Request to clear all Chromium data from the server
-  optional ClearUserDataMessage clear_user_data = 9;
+
+  // Request to clear all Chromium data from the server.
+  // DEPRECATED - this field was never used in production.
+  // optional ClearUserDataMessage clear_user_data = 9;
 
   optional string store_birthday = 7; // Opaque store ID; if it changes, duck!
   // The client sets this if it detects a sync issue. The server will tell it
@@ -632,7 +625,8 @@ message ClientToServerResponse {
   optional CommitResponse commit = 1;
   optional GetUpdatesResponse get_updates = 2;
   optional AuthenticateResponse authenticate = 3;
-  optional ClearUserDataResponse clear_user_data = 9;
+  // DEPRECATED - this field was never used in production.
+  // optional ClearUserDataResponse clear_user_data = 9;
   optional GetUpdatesMetadataResponse stream_metadata = 10;
   // If GetUpdatesStreamingResponse is contained in the ClientToServerResponse,
   // none of the other fields (error_code and etc) will be set.