| Index: sync/engine/sync_thread_sync_entity_unittest.cc
 | 
| diff --git a/sync/engine/sync_thread_sync_entity_unittest.cc b/sync/engine/sync_thread_sync_entity_unittest.cc
 | 
| deleted file mode 100644
 | 
| index be2604b1a5eede452435e8dc41dd6cca3fd280e4..0000000000000000000000000000000000000000
 | 
| --- a/sync/engine/sync_thread_sync_entity_unittest.cc
 | 
| +++ /dev/null
 | 
| @@ -1,164 +0,0 @@
 | 
| -
 | 
| -// Copyright 2014 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_thread_sync_entity.h"
 | 
| -
 | 
| -#include "base/memory/scoped_ptr.h"
 | 
| -#include "base/time/time.h"
 | 
| -#include "sync/internal_api/public/base/model_type.h"
 | 
| -#include "sync/syncable/syncable_util.h"
 | 
| -#include "sync/util/time.h"
 | 
| -#include "testing/gtest/include/gtest/gtest.h"
 | 
| -
 | 
| -namespace syncer {
 | 
| -
 | 
| -// Some simple tests for the SyncThreadSyncEntity.
 | 
| -//
 | 
| -// The SyncThreadSyncEntity is an implementation detail of the
 | 
| -// NonBlockingTypeProcessorCore.  As such, it doesn't make much sense to test
 | 
| -// it exhaustively, since it already gets a lot of test coverage from the
 | 
| -// NonBlockingTypeProcessorCore unit tests.
 | 
| -//
 | 
| -// These tests are intended as a basic sanity check.  Anything more complicated
 | 
| -// would be redundant.
 | 
| -class SyncThreadSyncEntityTest : public ::testing::Test {
 | 
| - public:
 | 
| -  SyncThreadSyncEntityTest()
 | 
| -      : kServerId("ServerID"),
 | 
| -        kClientTag("some.sample.tag"),
 | 
| -        kClientTagHash(syncable::GenerateSyncableHash(PREFERENCES, kClientTag)),
 | 
| -        kCtime(base::Time::UnixEpoch() + base::TimeDelta::FromDays(10)),
 | 
| -        kMtime(base::Time::UnixEpoch() + base::TimeDelta::FromDays(20)) {
 | 
| -    specifics.mutable_preference()->set_name(kClientTag);
 | 
| -    specifics.mutable_preference()->set_value("pref.value");
 | 
| -  }
 | 
| -
 | 
| -  virtual ~SyncThreadSyncEntityTest() {}
 | 
| -
 | 
| -  const std::string kServerId;
 | 
| -  const std::string kClientTag;
 | 
| -  const std::string kClientTagHash;
 | 
| -  const base::Time kCtime;
 | 
| -  const base::Time kMtime;
 | 
| -  sync_pb::EntitySpecifics specifics;
 | 
| -};
 | 
| -
 | 
| -// Construct a new entity from a server update.  Then receive another update.
 | 
| -TEST_F(SyncThreadSyncEntityTest, FromServerUpdate) {
 | 
| -  scoped_ptr<SyncThreadSyncEntity> entity(
 | 
| -      SyncThreadSyncEntity::FromServerUpdate(kServerId, kClientTagHash, 10));
 | 
| -  EXPECT_FALSE(entity->IsCommitPending());
 | 
| -
 | 
| -  entity->ReceiveUpdate(20);
 | 
| -  EXPECT_FALSE(entity->IsCommitPending());
 | 
| -}
 | 
| -
 | 
| -// Construct a new entity from a commit request.  Then serialize it.
 | 
| -TEST_F(SyncThreadSyncEntityTest, FromCommitRequest) {
 | 
| -  scoped_ptr<SyncThreadSyncEntity> entity(
 | 
| -      SyncThreadSyncEntity::FromCommitRequest(kServerId,
 | 
| -                                              kClientTagHash,
 | 
| -                                              22,
 | 
| -                                              33,
 | 
| -                                              kCtime,
 | 
| -                                              kMtime,
 | 
| -                                              kClientTag,
 | 
| -                                              false,
 | 
| -                                              specifics));
 | 
| -
 | 
| -  ASSERT_TRUE(entity->IsCommitPending());
 | 
| -  sync_pb::SyncEntity pb_entity;
 | 
| -  int64 sequence_number = 0;
 | 
| -  entity->PrepareCommitProto(&pb_entity, &sequence_number);
 | 
| -  EXPECT_EQ(22, sequence_number);
 | 
| -  EXPECT_EQ(kServerId, pb_entity.id_string());
 | 
| -  EXPECT_EQ(kClientTagHash, pb_entity.client_defined_unique_tag());
 | 
| -  EXPECT_EQ(33, pb_entity.version());
 | 
| -  EXPECT_EQ(kCtime, ProtoTimeToTime(pb_entity.ctime()));
 | 
| -  EXPECT_EQ(kMtime, ProtoTimeToTime(pb_entity.mtime()));
 | 
| -  EXPECT_FALSE(pb_entity.deleted());
 | 
| -  EXPECT_EQ(specifics.preference().name(),
 | 
| -            pb_entity.specifics().preference().name());
 | 
| -  EXPECT_EQ(specifics.preference().value(),
 | 
| -            pb_entity.specifics().preference().value());
 | 
| -}
 | 
| -
 | 
| -// Start with a server initiated entity.  Commit over top of it.
 | 
| -TEST_F(SyncThreadSyncEntityTest, RequestCommit) {
 | 
| -  scoped_ptr<SyncThreadSyncEntity> entity(
 | 
| -      SyncThreadSyncEntity::FromServerUpdate(kServerId, kClientTagHash, 10));
 | 
| -
 | 
| -  entity->RequestCommit(kServerId,
 | 
| -                        kClientTagHash,
 | 
| -                        1,
 | 
| -                        10,
 | 
| -                        kCtime,
 | 
| -                        kMtime,
 | 
| -                        kClientTag,
 | 
| -                        false,
 | 
| -                        specifics);
 | 
| -
 | 
| -  EXPECT_TRUE(entity->IsCommitPending());
 | 
| -}
 | 
| -
 | 
| -// Start with a server initiated entity.  Fail to request a commit because of
 | 
| -// an out of date base version.
 | 
| -TEST_F(SyncThreadSyncEntityTest, RequestCommitFailure) {
 | 
| -  scoped_ptr<SyncThreadSyncEntity> entity(
 | 
| -      SyncThreadSyncEntity::FromServerUpdate(kServerId, kClientTagHash, 10));
 | 
| -  EXPECT_FALSE(entity->IsCommitPending());
 | 
| -
 | 
| -  entity->RequestCommit(kServerId,
 | 
| -                        kClientTagHash,
 | 
| -                        23,
 | 
| -                        5,  // Version 5 < 10
 | 
| -                        kCtime,
 | 
| -                        kMtime,
 | 
| -                        kClientTag,
 | 
| -                        false,
 | 
| -                        specifics);
 | 
| -  EXPECT_FALSE(entity->IsCommitPending());
 | 
| -}
 | 
| -
 | 
| -// Start with a pending commit.  Clobber it with an incoming update.
 | 
| -TEST_F(SyncThreadSyncEntityTest, UpdateClobbersCommit) {
 | 
| -  scoped_ptr<SyncThreadSyncEntity> entity(
 | 
| -      SyncThreadSyncEntity::FromCommitRequest(kServerId,
 | 
| -                                              kClientTagHash,
 | 
| -                                              22,
 | 
| -                                              33,
 | 
| -                                              kCtime,
 | 
| -                                              kMtime,
 | 
| -                                              kClientTag,
 | 
| -                                              false,
 | 
| -                                              specifics));
 | 
| -
 | 
| -  EXPECT_TRUE(entity->IsCommitPending());
 | 
| -
 | 
| -  entity->ReceiveUpdate(400);  // Version 400 > 33.
 | 
| -  EXPECT_FALSE(entity->IsCommitPending());
 | 
| -}
 | 
| -
 | 
| -// Start with a pending commit.  Send it a reflected update that
 | 
| -// will not override the in-progress commit.
 | 
| -TEST_F(SyncThreadSyncEntityTest, ReflectedUpdateDoesntClobberCommit) {
 | 
| -  scoped_ptr<SyncThreadSyncEntity> entity(
 | 
| -      SyncThreadSyncEntity::FromCommitRequest(kServerId,
 | 
| -                                              kClientTagHash,
 | 
| -                                              22,
 | 
| -                                              33,
 | 
| -                                              kCtime,
 | 
| -                                              kMtime,
 | 
| -                                              kClientTag,
 | 
| -                                              false,
 | 
| -                                              specifics));
 | 
| -
 | 
| -  EXPECT_TRUE(entity->IsCommitPending());
 | 
| -
 | 
| -  entity->ReceiveUpdate(33);  // Version 33 == 33.
 | 
| -  EXPECT_TRUE(entity->IsCommitPending());
 | 
| -}
 | 
| -
 | 
| -}  // namespace syncer
 | 
| 
 |