| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/browser/sync/engine/verify_updates_command.h" | 5 #include "chrome/browser/sync/engine/verify_updates_command.h" |
| 6 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h" | 6 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h" |
| 7 #include "chrome/browser/sync/sessions/sync_session.h" | 7 #include "chrome/browser/sync/sessions/sync_session.h" |
| 8 #include "chrome/browser/sync/syncable/directory_manager.h" | 8 #include "chrome/browser/sync/syncable/directory_manager.h" |
| 9 #include "chrome/browser/sync/engine/mock_model_safe_workers.h" | 9 #include "chrome/browser/sync/engine/mock_model_safe_workers.h" |
| 10 #include "chrome/browser/sync/syncable/syncable.h" | 10 #include "chrome/browser/sync/syncable/syncable.h" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 workers()->push_back(new MockUIModelWorker()); | 34 workers()->push_back(new MockUIModelWorker()); |
| 35 (*mutable_routing_info())[syncable::PREFERENCES] = GROUP_UI; | 35 (*mutable_routing_info())[syncable::PREFERENCES] = GROUP_UI; |
| 36 (*mutable_routing_info())[syncable::BOOKMARKS] = GROUP_UI; | 36 (*mutable_routing_info())[syncable::BOOKMARKS] = GROUP_UI; |
| 37 (*mutable_routing_info())[syncable::AUTOFILL] = GROUP_DB; | 37 (*mutable_routing_info())[syncable::AUTOFILL] = GROUP_DB; |
| 38 SyncerCommandTest::SetUp(); | 38 SyncerCommandTest::SetUp(); |
| 39 } | 39 } |
| 40 | 40 |
| 41 void CreateLocalItem(const std::string& item_id, | 41 void CreateLocalItem(const std::string& item_id, |
| 42 const std::string& parent_id, | 42 const std::string& parent_id, |
| 43 const syncable::ModelType& type) { | 43 const syncable::ModelType& type) { |
| 44 ScopedDirLookup dir(syncdb().manager(), syncdb().name()); | 44 ScopedDirLookup dir(syncdb()->manager(), syncdb()->name()); |
| 45 ASSERT_TRUE(dir.good()); | 45 ASSERT_TRUE(dir.good()); |
| 46 WriteTransaction trans(dir, UNITTEST, __FILE__, __LINE__); | 46 WriteTransaction trans(dir, UNITTEST, __FILE__, __LINE__); |
| 47 MutableEntry entry(&trans, syncable::CREATE_NEW_UPDATE_ITEM, | 47 MutableEntry entry(&trans, syncable::CREATE_NEW_UPDATE_ITEM, |
| 48 Id::CreateFromServerId(item_id)); | 48 Id::CreateFromServerId(item_id)); |
| 49 ASSERT_TRUE(entry.good()); | 49 ASSERT_TRUE(entry.good()); |
| 50 | 50 |
| 51 entry.Put(syncable::BASE_VERSION, 1); | 51 entry.Put(syncable::BASE_VERSION, 1); |
| 52 entry.Put(syncable::SERVER_VERSION, 1); | 52 entry.Put(syncable::SERVER_VERSION, 1); |
| 53 entry.Put(syncable::NON_UNIQUE_NAME, item_id); | 53 entry.Put(syncable::NON_UNIQUE_NAME, item_id); |
| 54 entry.Put(syncable::PARENT_ID, Id::CreateFromServerId(parent_id)); | 54 entry.Put(syncable::PARENT_ID, Id::CreateFromServerId(parent_id)); |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 sessions::ScopedModelSafeGroupRestriction r(status, GROUP_DB); | 98 sessions::ScopedModelSafeGroupRestriction r(status, GROUP_DB); |
| 99 EXPECT_EQ(1, status->update_progress().VerifiedUpdatesSize()); | 99 EXPECT_EQ(1, status->update_progress().VerifiedUpdatesSize()); |
| 100 } | 100 } |
| 101 { | 101 { |
| 102 sessions::ScopedModelSafeGroupRestriction r(status, GROUP_PASSIVE); | 102 sessions::ScopedModelSafeGroupRestriction r(status, GROUP_PASSIVE); |
| 103 EXPECT_EQ(0, status->update_progress().VerifiedUpdatesSize()); | 103 EXPECT_EQ(0, status->update_progress().VerifiedUpdatesSize()); |
| 104 } | 104 } |
| 105 } | 105 } |
| 106 | 106 |
| 107 } | 107 } |
| OLD | NEW |