| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "components/invalidation/unacked_invalidation_set_test_util.h" | 5 #include "components/invalidation/impl/unacked_invalidation_set_test_util.h" |
| 6 | 6 |
| 7 #include "base/json/json_string_value_serializer.h" | 7 #include "base/json/json_string_value_serializer.h" |
| 8 #include "components/invalidation/object_id_invalidation_map.h" | 8 #include "components/invalidation/public/object_id_invalidation_map.h" |
| 9 #include "testing/gmock/include/gmock/gmock-matchers.h" | 9 #include "testing/gmock/include/gmock/gmock-matchers.h" |
| 10 | 10 |
| 11 namespace syncer { | 11 namespace syncer { |
| 12 | 12 |
| 13 using ::testing::MakeMatcher; | 13 using ::testing::MakeMatcher; |
| 14 using ::testing::MatchResultListener; | 14 using ::testing::MatchResultListener; |
| 15 using ::testing::Matcher; | 15 using ::testing::Matcher; |
| 16 using ::testing::MatcherInterface; | 16 using ::testing::MatcherInterface; |
| 17 using ::testing::PrintToString; | 17 using ::testing::PrintToString; |
| 18 | 18 |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 } | 174 } |
| 175 | 175 |
| 176 Matcher<const UnackedInvalidationsMap&> Eq( | 176 Matcher<const UnackedInvalidationsMap&> Eq( |
| 177 const UnackedInvalidationsMap& expected) { | 177 const UnackedInvalidationsMap& expected) { |
| 178 return MakeMatcher(new UnackedInvalidationsMapEqMatcher(expected)); | 178 return MakeMatcher(new UnackedInvalidationsMapEqMatcher(expected)); |
| 179 } | 179 } |
| 180 | 180 |
| 181 } // namespace test_util | 181 } // namespace test_util |
| 182 | 182 |
| 183 }; | 183 }; |
| OLD | NEW |