OLD | NEW |
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 <vector> | 5 #include <vector> |
6 | 6 |
7 #include "base/location.h" | 7 #include "base/location.h" |
8 #include "base/stringprintf.h" | 8 #include "base/stringprintf.h" |
9 #include "chrome/browser/sync/engine/process_commit_response_command.h" | 9 #include "sync/engine/process_commit_response_command.h" |
10 #include "chrome/browser/sync/sessions/sync_session.h" | 10 #include "sync/sessions/sync_session.h" |
11 #include "chrome/browser/sync/syncable/syncable.h" | 11 #include "sync/syncable/syncable.h" |
12 #include "chrome/browser/sync/syncable/syncable_id.h" | 12 #include "sync/syncable/syncable_id.h" |
13 #include "chrome/browser/sync/test/engine/fake_model_worker.h" | 13 #include "sync/test/engine/fake_model_worker.h" |
14 #include "chrome/browser/sync/test/engine/syncer_command_test.h" | 14 #include "sync/test/engine/syncer_command_test.h" |
15 #include "chrome/browser/sync/test/engine/test_id_factory.h" | 15 #include "sync/test/engine/test_id_factory.h" |
16 #include "sync/protocol/bookmark_specifics.pb.h" | 16 #include "sync/protocol/bookmark_specifics.pb.h" |
17 #include "sync/protocol/sync.pb.h" | 17 #include "sync/protocol/sync.pb.h" |
18 #include "testing/gtest/include/gtest/gtest.h" | 18 #include "testing/gtest/include/gtest/gtest.h" |
19 | 19 |
20 namespace browser_sync { | 20 namespace browser_sync { |
21 | 21 |
22 using sessions::SyncSession; | 22 using sessions::SyncSession; |
23 using std::string; | 23 using std::string; |
24 using syncable::BASE_VERSION; | 24 using syncable::BASE_VERSION; |
25 using syncable::Entry; | 25 using syncable::Entry; |
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
428 EXPECT_EQ("xyz", final_monitor_records["xyz"].extension_id); | 428 EXPECT_EQ("xyz", final_monitor_records["xyz"].extension_id); |
429 EXPECT_EQ(2049U, final_monitor_records["ABC"].bookmark_write_count); | 429 EXPECT_EQ(2049U, final_monitor_records["ABC"].bookmark_write_count); |
430 EXPECT_EQ(4U, final_monitor_records["xyz"].bookmark_write_count); | 430 EXPECT_EQ(4U, final_monitor_records["xyz"].bookmark_write_count); |
431 } else { | 431 } else { |
432 EXPECT_TRUE(final_monitor_records.empty()) | 432 EXPECT_TRUE(final_monitor_records.empty()) |
433 << "Should not restore records after successful bookmark commit."; | 433 << "Should not restore records after successful bookmark commit."; |
434 } | 434 } |
435 } | 435 } |
436 | 436 |
437 } // namespace browser_sync | 437 } // namespace browser_sync |
OLD | NEW |