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

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

Issue 9699057: [Sync] Move 'sync' target to sync/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Tim's comments Created 8 years, 9 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/apply_updates_command.cc ('k') | sync/engine/build_commit_command.h » ('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) 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 #include <string> 5 #include <string>
6 6
7 #include "base/format_macros.h" 7 #include "base/format_macros.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/stringprintf.h" 9 #include "base/stringprintf.h"
10 #include "chrome/browser/sync/engine/apply_updates_command.h" 10 #include "sync/engine/apply_updates_command.h"
11 #include "chrome/browser/sync/engine/nigori_util.h" 11 #include "sync/engine/nigori_util.h"
12 #include "chrome/browser/sync/engine/syncer.h" 12 #include "sync/engine/syncer.h"
13 #include "chrome/browser/sync/engine/syncer_util.h" 13 #include "sync/engine/syncer_util.h"
14 #include "chrome/browser/sync/sessions/sync_session.h"
15 #include "chrome/browser/sync/syncable/syncable.h"
16 #include "chrome/browser/sync/syncable/syncable_id.h"
17 #include "chrome/browser/sync/test/engine/fake_model_worker.h"
18 #include "chrome/browser/sync/test/engine/syncer_command_test.h"
19 #include "chrome/browser/sync/test/engine/test_id_factory.h"
20 #include "chrome/browser/sync/test/fake_encryptor.h"
21 #include "chrome/browser/sync/util/cryptographer.h"
22 #include "sync/protocol/bookmark_specifics.pb.h" 14 #include "sync/protocol/bookmark_specifics.pb.h"
23 #include "sync/protocol/password_specifics.pb.h" 15 #include "sync/protocol/password_specifics.pb.h"
16 #include "sync/sessions/sync_session.h"
17 #include "sync/syncable/syncable.h"
18 #include "sync/syncable/syncable_id.h"
19 #include "sync/test/engine/fake_model_worker.h"
20 #include "sync/test/engine/syncer_command_test.h"
21 #include "sync/test/engine/test_id_factory.h"
22 #include "sync/test/fake_encryptor.h"
23 #include "sync/util/cryptographer.h"
24 #include "testing/gtest/include/gtest/gtest.h" 24 #include "testing/gtest/include/gtest/gtest.h"
25 25
26 namespace browser_sync { 26 namespace browser_sync {
27 27
28 using sessions::SyncSession; 28 using sessions::SyncSession;
29 using std::string; 29 using std::string;
30 using syncable::Entry; 30 using syncable::Entry;
31 using syncable::Id; 31 using syncable::Id;
32 using syncable::MutableEntry; 32 using syncable::MutableEntry;
33 using syncable::ReadTransaction; 33 using syncable::ReadTransaction;
(...skipping 964 matching lines...) Expand 10 before | Expand all | Expand 10 after
998 EXPECT_FALSE(cryptographer->is_ready()); 998 EXPECT_FALSE(cryptographer->is_ready());
999 EXPECT_TRUE(cryptographer->has_pending_keys()); 999 EXPECT_TRUE(cryptographer->has_pending_keys());
1000 1000
1001 Syncer::UnsyncedMetaHandles handles; 1001 Syncer::UnsyncedMetaHandles handles;
1002 SyncerUtil::GetUnsyncedEntries(&trans, &handles); 1002 SyncerUtil::GetUnsyncedEntries(&trans, &handles);
1003 EXPECT_EQ(2*batch_s+1, handles.size()); 1003 EXPECT_EQ(2*batch_s+1, handles.size());
1004 } 1004 }
1005 } 1005 }
1006 1006
1007 } // namespace browser_sync 1007 } // namespace browser_sync
OLDNEW
« no previous file with comments | « sync/engine/apply_updates_command.cc ('k') | sync/engine/build_commit_command.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698