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 "base/basictypes.h" | 5 #include "base/basictypes.h" |
6 #include "sync/engine/store_timestamps_command.h" | 6 #include "sync/engine/store_timestamps_command.h" |
7 #include "sync/internal_api/public/base/model_type.h" | 7 #include "sync/internal_api/public/base/model_type.h" |
8 #include "sync/protocol/sync.pb.h" | 8 #include "sync/protocol/sync.pb.h" |
9 #include "sync/test/engine/syncer_command_test.h" | 9 #include "sync/test/engine/syncer_command_test.h" |
10 #include "testing/gtest/include/gtest/gtest.h" | 10 #include "testing/gtest/include/gtest/gtest.h" |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 response, session()->context()->directory()); | 64 response, session()->context()->directory()); |
65 | 65 |
66 EXPECT_TRUE( | 66 EXPECT_TRUE( |
67 forward_progress_types.Equals( | 67 forward_progress_types.Equals( |
68 ModelTypeSet(BOOKMARKS, HISTORY_DELETE_DIRECTIVES))); | 68 ModelTypeSet(BOOKMARKS, HISTORY_DELETE_DIRECTIVES))); |
69 | 69 |
70 EXPECT_EQ("token1", GetProgessMarkerToken(BOOKMARKS)); | 70 EXPECT_EQ("token1", GetProgessMarkerToken(BOOKMARKS)); |
71 EXPECT_EQ("token2", GetProgessMarkerToken(HISTORY_DELETE_DIRECTIVES)); | 71 EXPECT_EQ("token2", GetProgessMarkerToken(HISTORY_DELETE_DIRECTIVES)); |
72 | 72 |
73 ModelTypeSet non_forward_progress_types = | 73 ModelTypeSet non_forward_progress_types = |
74 Difference(ModelTypeSet::All(), forward_progress_types); | 74 Difference(ProtocolTypes(), forward_progress_types); |
75 for (ModelTypeSet::Iterator it = non_forward_progress_types.First(); | 75 for (ModelTypeSet::Iterator it = non_forward_progress_types.First(); |
76 it.Good(); it.Inc()) { | 76 it.Good(); it.Inc()) { |
77 EXPECT_TRUE(GetProgessMarkerToken(it.Get()).empty()); | 77 EXPECT_TRUE(GetProgessMarkerToken(it.Get()).empty()); |
78 } | 78 } |
79 } | 79 } |
80 | 80 |
81 } // namespace | 81 } // namespace |
82 | 82 |
83 } // namespace syncer | 83 } // namespace syncer |
OLD | NEW |