Fix handling of undeletion within the syncer.

chrome/browser/sync/engine/syncer_proto_util_unittest.cc

 // Copyright (c) 2006-2008 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/syncer_proto_util.h"
 
 #include "base/basictypes.h"
 #include "chrome/browser/sync/engine/syncproto.h"
 #include "chrome/browser/sync/syncable/blob.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
@@ skipping 69 matching lines @@
   SyncEntity one_name_entity;
   CommitResponse_EntryResponse one_name_response;
 
   const std::string one_name_string("Eggheadednesses");
   one_name_entity.set_name(one_name_string);
   one_name_response.set_name(one_name_string);
 
   const std::string name_a =
       SyncerProtoUtil::NameFromSyncEntity(one_name_entity);
   EXPECT_EQ(one_name_string, name_a);
-
-  const std::string name_b =
-      SyncerProtoUtil::NameFromCommitEntryResponse(one_name_response);
-  EXPECT_EQ(one_name_string, name_b);
-  EXPECT_TRUE(name_a == name_b);
 }
 
 TEST(SyncerProtoUtil, NameExtractionOneUniqueName) {
   SyncEntity one_name_entity;
   CommitResponse_EntryResponse one_name_response;
 
   const std::string one_name_string("Eggheadednesses");
 
   one_name_entity.set_non_unique_name(one_name_string);
   one_name_response.set_non_unique_name(one_name_string);
 
   const std::string name_a =
       SyncerProtoUtil::NameFromSyncEntity(one_name_entity);
   EXPECT_EQ(one_name_string, name_a);
-
-  const std::string name_b =
-      SyncerProtoUtil::NameFromCommitEntryResponse(one_name_response);
-  EXPECT_EQ(one_name_string, name_b);
-  EXPECT_TRUE(name_a == name_b);
 }
 
 // Tests NameFromSyncEntity and NameFromCommitEntryResponse when both the name
 // field and the non_unique_name fields are provided.
 // Should prioritize non_unique_name.
 TEST(SyncerProtoUtil, NameExtractionTwoNames) {
   SyncEntity two_name_entity;
   CommitResponse_EntryResponse two_name_response;
 
   const std::string neuro("Neuroanatomists");
   const std::string oxyphen("Oxyphenbutazone");
 
   two_name_entity.set_name(oxyphen);
   two_name_entity.set_non_unique_name(neuro);
 
   two_name_response.set_name(oxyphen);
   two_name_response.set_non_unique_name(neuro);
 
   const std::string name_a =
       SyncerProtoUtil::NameFromSyncEntity(two_name_entity);
   EXPECT_EQ(neuro, name_a);
-
-  const std::string name_b =
-      SyncerProtoUtil::NameFromCommitEntryResponse(two_name_response);
-  EXPECT_EQ(neuro, name_b);
-
-  EXPECT_TRUE(name_a == name_b);
 }
 
 class SyncerProtoUtilTest : public testing::Test {
  public:
   virtual void SetUp() {
     setter_upper_.SetUp();
   }
 
   virtual void TearDown() {
     setter_upper_.TearDown();
@@ skipping 79 matching lines @@
 
 TEST_F(SyncerProtoUtilTest, PostAndProcessHeaders) {
   DummyConnectionManager dcm;
   ClientToServerMessage msg;
   msg.set_share("required");
   msg.set_message_contents(ClientToServerMessage::GET_UPDATES);
   ClientToServerResponse response;
 
   dcm.set_send_error(true);
   EXPECT_FALSE(SyncerProtoUtil::PostAndProcessHeaders(&dcm, NULL,
-      &msg, &response));
+      msg, &response));
 
   dcm.set_send_error(false);
   EXPECT_TRUE(SyncerProtoUtil::PostAndProcessHeaders(&dcm, NULL,
-      &msg, &response));
+      msg, &response));
 
   dcm.set_access_denied(true);
   EXPECT_FALSE(SyncerProtoUtil::PostAndProcessHeaders(&dcm, NULL,
-      &msg, &response));
+      msg, &response));
 }
 
 }  // namespace browser_sync