Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(162)

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

Issue 6995008: Implement new SyncAPI and convert Preferences to it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and fix compile Created 9 years, 7 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 | « chrome/browser/sync/engine/syncapi.cc ('k') | chrome/browser/sync/engine/syncer_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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>
11 #include <map> 11 #include <map>
12 #include <set> 12 #include <set>
13 #include <string> 13 #include <string>
14 14
15 #include "base/callback.h" 15 #include "base/callback.h"
16 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
17 #include "base/stringprintf.h" 17 #include "base/stringprintf.h"
18 #include "base/string_number_conversions.h" 18 #include "base/string_number_conversions.h"
19 #include "build/build_config.h" 19 #include "build/build_config.h"
20 #include "chrome/browser/sync/engine/conflict_resolver.h" 20 #include "chrome/browser/sync/engine/conflict_resolver.h"
21 #include "chrome/browser/sync/engine/get_commit_ids_command.h" 21 #include "chrome/browser/sync/engine/get_commit_ids_command.h"
22 #include "chrome/browser/sync/engine/model_safe_worker.h" 22 #include "chrome/browser/sync/engine/model_safe_worker.h"
23 #include "chrome/browser/sync/engine/net/server_connection_manager.h" 23 #include "chrome/browser/sync/engine/net/server_connection_manager.h"
24 #include "chrome/browser/sync/engine/process_updates_command.h" 24 #include "chrome/browser/sync/engine/process_updates_command.h"
25 #include "chrome/browser/sync/engine/syncer.h" 25 #include "chrome/browser/sync/engine/syncer.h"
26 #include "chrome/browser/sync/engine/syncer_proto_util.h" 26 #include "chrome/browser/sync/engine/syncer_proto_util.h"
27 #include "chrome/browser/sync/engine/syncer_util.h" 27 #include "chrome/browser/sync/engine/syncer_util.h"
28 #include "chrome/browser/sync/engine/syncproto.h" 28 #include "chrome/browser/sync/engine/syncproto.h"
29 #include "chrome/browser/sync/protocol/sync.pb.h" 29 #include "chrome/browser/sync/protocol/sync.pb.h"
30 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"
30 #include "chrome/browser/sync/sessions/sync_session_context.h" 31 #include "chrome/browser/sync/sessions/sync_session_context.h"
31 #include "chrome/browser/sync/syncable/directory_manager.h" 32 #include "chrome/browser/sync/syncable/directory_manager.h"
32 #include "chrome/browser/sync/syncable/model_type.h" 33 #include "chrome/browser/sync/syncable/model_type.h"
33 #include "chrome/browser/sync/syncable/syncable.h" 34 #include "chrome/browser/sync/syncable/syncable.h"
34 #include "chrome/common/deprecated/event_sys-inl.h" 35 #include "chrome/common/deprecated/event_sys-inl.h"
35 #include "chrome/test/sync/engine/mock_connection_manager.h" 36 #include "chrome/test/sync/engine/mock_connection_manager.h"
36 #include "chrome/test/sync/engine/test_directory_setter_upper.h" 37 #include "chrome/test/sync/engine/test_directory_setter_upper.h"
37 #include "chrome/test/sync/engine/test_id_factory.h" 38 #include "chrome/test/sync/engine/test_id_factory.h"
38 #include "chrome/test/sync/engine/test_syncable_utils.h" 39 #include "chrome/test/sync/engine/test_syncable_utils.h"
39 #include "testing/gtest/include/gtest/gtest.h" 40 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 5136 matching lines...) Expand 10 before | Expand all | Expand 10 after
5176 Add(low_id_); 5177 Add(low_id_);
5177 Add(high_id_); 5178 Add(high_id_);
5178 SyncShareAsDelegate(); 5179 SyncShareAsDelegate();
5179 ExpectLocalOrderIsByServerId(); 5180 ExpectLocalOrderIsByServerId();
5180 } 5181 }
5181 5182
5182 const SyncerTest::CommitOrderingTest 5183 const SyncerTest::CommitOrderingTest
5183 SyncerTest::CommitOrderingTest::LAST_COMMIT_ITEM = {-1, TestIdFactory::root()}; 5184 SyncerTest::CommitOrderingTest::LAST_COMMIT_ITEM = {-1, TestIdFactory::root()};
5184 5185
5185 } // namespace browser_sync 5186 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/engine/syncapi.cc ('k') | chrome/browser/sync/engine/syncer_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698