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

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

Issue 7879006: Delete Tracked, and move Location to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed Tracked, and put Location into location.h Created 9 years, 3 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
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/compiler_specific.h" 16 #include "base/compiler_specific.h"
17 #include "base/location.h"
17 #include "base/memory/scoped_ptr.h" 18 #include "base/memory/scoped_ptr.h"
19 #include "base/string_number_conversions.h"
18 #include "base/stringprintf.h" 20 #include "base/stringprintf.h"
19 #include "base/string_number_conversions.h"
20 #include "base/tracked.h"
21 #include "build/build_config.h" 21 #include "build/build_config.h"
22 #include "chrome/browser/sync/engine/conflict_resolver.h" 22 #include "chrome/browser/sync/engine/conflict_resolver.h"
23 #include "chrome/browser/sync/engine/get_commit_ids_command.h" 23 #include "chrome/browser/sync/engine/get_commit_ids_command.h"
24 #include "chrome/browser/sync/engine/model_safe_worker.h" 24 #include "chrome/browser/sync/engine/model_safe_worker.h"
25 #include "chrome/browser/sync/engine/net/server_connection_manager.h" 25 #include "chrome/browser/sync/engine/net/server_connection_manager.h"
26 #include "chrome/browser/sync/engine/process_updates_command.h" 26 #include "chrome/browser/sync/engine/process_updates_command.h"
27 #include "chrome/browser/sync/engine/syncer.h" 27 #include "chrome/browser/sync/engine/syncer.h"
28 #include "chrome/browser/sync/engine/syncer_proto_util.h" 28 #include "chrome/browser/sync/engine/syncer_proto_util.h"
29 #include "chrome/browser/sync/engine/syncer_util.h" 29 #include "chrome/browser/sync/engine/syncer_util.h"
30 #include "chrome/browser/sync/engine/syncproto.h" 30 #include "chrome/browser/sync/engine/syncproto.h"
(...skipping 5209 matching lines...) Expand 10 before | Expand all | Expand 10 after
5240 Add(low_id_); 5240 Add(low_id_);
5241 Add(high_id_); 5241 Add(high_id_);
5242 SyncShareAsDelegate(); 5242 SyncShareAsDelegate();
5243 ExpectLocalOrderIsByServerId(); 5243 ExpectLocalOrderIsByServerId();
5244 } 5244 }
5245 5245
5246 const SyncerTest::CommitOrderingTest 5246 const SyncerTest::CommitOrderingTest
5247 SyncerTest::CommitOrderingTest::LAST_COMMIT_ITEM = {-1, TestIdFactory::root()}; 5247 SyncerTest::CommitOrderingTest::LAST_COMMIT_ITEM = {-1, TestIdFactory::root()};
5248 5248
5249 } // namespace browser_sync 5249 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698