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 <vector> | 5 #include <vector> |
6 | 6 |
7 #include "base/string_util.h" | 7 #include "base/string_util.h" |
8 #include "chrome/browser/sync/engine/mock_model_safe_workers.h" | 8 #include "chrome/browser/sync/engine/mock_model_safe_workers.h" |
9 #include "chrome/browser/sync/engine/process_commit_response_command.h" | 9 #include "chrome/browser/sync/engine/process_commit_response_command.h" |
10 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h" | 10 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h" |
(...skipping 24 matching lines...) Expand all Loading... |
35 | 35 |
36 // A test fixture for tests exercising ProcessCommitResponseCommand. | 36 // A test fixture for tests exercising ProcessCommitResponseCommand. |
37 template<typename T> | 37 template<typename T> |
38 class ProcessCommitResponseCommandTestWithParam | 38 class ProcessCommitResponseCommandTestWithParam |
39 : public SyncerCommandTestWithParam<T> { | 39 : public SyncerCommandTestWithParam<T> { |
40 public: | 40 public: |
41 virtual void SetUp() { | 41 virtual void SetUp() { |
42 workers()->clear(); | 42 workers()->clear(); |
43 mutable_routing_info()->clear(); | 43 mutable_routing_info()->clear(); |
44 | 44 |
45 workers()->push_back(new ModelSafeWorker()); // GROUP_PASSIVE worker. | 45 // GROUP_PASSIVE worker. |
46 workers()->push_back(new MockUIModelWorker()); // GROUP_UI worker. | 46 workers()->push_back(make_scoped_refptr(new ModelSafeWorker())); |
| 47 // GROUP_UI worker. |
| 48 workers()->push_back(make_scoped_refptr(new MockUIModelWorker())); |
47 (*mutable_routing_info())[syncable::BOOKMARKS] = GROUP_UI; | 49 (*mutable_routing_info())[syncable::BOOKMARKS] = GROUP_UI; |
48 (*mutable_routing_info())[syncable::PREFERENCES] = GROUP_UI; | 50 (*mutable_routing_info())[syncable::PREFERENCES] = GROUP_UI; |
49 (*mutable_routing_info())[syncable::AUTOFILL] = GROUP_PASSIVE; | 51 (*mutable_routing_info())[syncable::AUTOFILL] = GROUP_PASSIVE; |
50 | 52 |
51 commit_set_.reset(new sessions::OrderedCommitSet(routing_info())); | 53 commit_set_.reset(new sessions::OrderedCommitSet(routing_info())); |
52 SyncerCommandTestWithParam<T>::SetUp(); | 54 SyncerCommandTestWithParam<T>::SetUp(); |
53 } | 55 } |
54 | 56 |
55 protected: | 57 protected: |
56 using SyncerCommandTestWithParam<T>::context; | 58 using SyncerCommandTestWithParam<T>::context; |
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
427 EXPECT_EQ(2049U, final_monitor_records["ABC"].bookmark_write_count); | 429 EXPECT_EQ(2049U, final_monitor_records["ABC"].bookmark_write_count); |
428 EXPECT_EQ(4U, final_monitor_records["xyz"].bookmark_write_count); | 430 EXPECT_EQ(4U, final_monitor_records["xyz"].bookmark_write_count); |
429 } else { | 431 } else { |
430 EXPECT_TRUE(final_monitor_records.empty()) | 432 EXPECT_TRUE(final_monitor_records.empty()) |
431 << "Should not restore records after successful bookmark commit."; | 433 << "Should not restore records after successful bookmark commit."; |
432 } | 434 } |
433 } | 435 } |
434 | 436 |
435 | 437 |
436 } // namespace browser_sync | 438 } // namespace browser_sync |
OLD | NEW |