| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "sync/engine/process_commit_response_command.h" | 5 #include "sync/engine/process_commit_response_command.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/location.h" | 9 #include "base/location.h" |
| 10 #include "base/stringprintf.h" | 10 #include "base/stringprintf.h" |
| 11 #include "sync/protocol/bookmark_specifics.pb.h" | 11 #include "sync/protocol/bookmark_specifics.pb.h" |
| 12 #include "sync/protocol/sync.pb.h" | 12 #include "sync/protocol/sync.pb.h" |
| 13 #include "sync/sessions/sync_session.h" | 13 #include "sync/sessions/sync_session.h" |
| 14 #include "sync/syncable/entry.h" | 14 #include "sync/syncable/entry.h" |
| 15 #include "sync/syncable/mutable_entry.h" | 15 #include "sync/syncable/mutable_entry.h" |
| 16 #include "sync/syncable/read_transaction.h" | |
| 17 #include "sync/syncable/syncable_id.h" | 16 #include "sync/syncable/syncable_id.h" |
| 18 #include "sync/syncable/syncable_proto_util.h" | 17 #include "sync/syncable/syncable_proto_util.h" |
| 19 #include "sync/syncable/write_transaction.h" | 18 #include "sync/syncable/syncable_read_transaction.h" |
| 19 #include "sync/syncable/syncable_write_transaction.h" |
| 20 #include "sync/test/engine/fake_model_worker.h" | 20 #include "sync/test/engine/fake_model_worker.h" |
| 21 #include "sync/test/engine/syncer_command_test.h" | 21 #include "sync/test/engine/syncer_command_test.h" |
| 22 #include "sync/test/engine/test_id_factory.h" | 22 #include "sync/test/engine/test_id_factory.h" |
| 23 #include "testing/gtest/include/gtest/gtest.h" | 23 #include "testing/gtest/include/gtest/gtest.h" |
| 24 | 24 |
| 25 using std::string; | 25 using std::string; |
| 26 using sync_pb::ClientToServerMessage; | 26 using sync_pb::ClientToServerMessage; |
| 27 using sync_pb::CommitResponse; | 27 using sync_pb::CommitResponse; |
| 28 | 28 |
| 29 namespace syncer { | 29 namespace syncer { |
| (...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 448 EXPECT_EQ("xyz", final_monitor_records["xyz"].extension_id); | 448 EXPECT_EQ("xyz", final_monitor_records["xyz"].extension_id); |
| 449 EXPECT_EQ(2049U, final_monitor_records["ABC"].bookmark_write_count); | 449 EXPECT_EQ(2049U, final_monitor_records["ABC"].bookmark_write_count); |
| 450 EXPECT_EQ(4U, final_monitor_records["xyz"].bookmark_write_count); | 450 EXPECT_EQ(4U, final_monitor_records["xyz"].bookmark_write_count); |
| 451 } else { | 451 } else { |
| 452 EXPECT_TRUE(final_monitor_records.empty()) | 452 EXPECT_TRUE(final_monitor_records.empty()) |
| 453 << "Should not restore records after successful bookmark commit."; | 453 << "Should not restore records after successful bookmark commit."; |
| 454 } | 454 } |
| 455 } | 455 } |
| 456 | 456 |
| 457 } // namespace syncer | 457 } // namespace syncer |
| OLD | NEW |