sync/engine/syncer_unittest.cc - Issue 10735041: Remove syncproto.h

Side by Side Diff: sync/engine/syncer_unittest.cc

Issue 10735041: Remove syncproto.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address most comments Created 8 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « sync/engine/syncer_proto_util_unittest.cc ('k') | sync/engine/syncer_util.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4 //	4 //

5 // Syncer unit tests. Unfortunately a lot of these tests	5 // Syncer unit tests. Unfortunately a lot of these tests

6 // are outdated and need to be reworked and updated.	6 // are outdated and need to be reworked and updated.

7	7

8 #include <algorithm>	8 #include <algorithm>

9 #include <limits>	9 #include <limits>

10 #include <list>	10 #include <list>

(...skipping 11 matching lines...) Expand all Loading...
22 #include "base/string_number_conversions.h"	22 #include "base/string_number_conversions.h"

23 #include "base/stringprintf.h"	23 #include "base/stringprintf.h"

24 #include "base/time.h"	24 #include "base/time.h"

25 #include "build/build_config.h"	25 #include "build/build_config.h"

26 #include "sync/engine/get_commit_ids_command.h"	26 #include "sync/engine/get_commit_ids_command.h"

27 #include "sync/engine/net/server_connection_manager.h"	27 #include "sync/engine/net/server_connection_manager.h"

28 #include "sync/engine/process_updates_command.h"	28 #include "sync/engine/process_updates_command.h"

29 #include "sync/engine/sync_scheduler.h"	29 #include "sync/engine/sync_scheduler.h"

30 #include "sync/engine/syncer.h"	30 #include "sync/engine/syncer.h"

31 #include "sync/engine/syncer_proto_util.h"	31 #include "sync/engine/syncer_proto_util.h"

32 #include "sync/engine/syncproto.h"

33 #include "sync/engine/throttled_data_type_tracker.h"	32 #include "sync/engine/throttled_data_type_tracker.h"

34 #include "sync/engine/traffic_recorder.h"	33 #include "sync/engine/traffic_recorder.h"

35 #include "sync/internal_api/public/base/model_type.h"	34 #include "sync/internal_api/public/base/model_type.h"

36 #include "sync/internal_api/public/engine/model_safe_worker.h"	35 #include "sync/internal_api/public/engine/model_safe_worker.h"

37 #include "sync/protocol/bookmark_specifics.pb.h"	36 #include "sync/protocol/bookmark_specifics.pb.h"

38 #include "sync/protocol/nigori_specifics.pb.h"	37 #include "sync/protocol/nigori_specifics.pb.h"

39 #include "sync/protocol/preference_specifics.pb.h"	38 #include "sync/protocol/preference_specifics.pb.h"

40 #include "sync/protocol/sync.pb.h"	39 #include "sync/protocol/sync.pb.h"

41 #include "sync/sessions/sync_session_context.h"	40 #include "sync/sessions/sync_session_context.h"

42 #include "sync/syncable/mutable_entry.h"	41 #include "sync/syncable/mutable_entry.h"

(...skipping 4781 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
4824	4823

4825 TEST_F(SyncerPositionTiebreakingTest, MidLowHigh) {	4824 TEST_F(SyncerPositionTiebreakingTest, MidLowHigh) {

4826 Add(mid_id_);	4825 Add(mid_id_);

4827 Add(low_id_);	4826 Add(low_id_);

4828 Add(high_id_);	4827 Add(high_id_);

4829 SyncShareNudge();	4828 SyncShareNudge();

4830 ExpectLocalOrderIsByServerId();	4829 ExpectLocalOrderIsByServerId();

4831 }	4830 }

4832	4831

4833 } // namespace syncer	4832 } // namespace syncer

OLD	NEW