| Index: components/sync/base/model_type_test_util.cc
|
| diff --git a/sync/internal_api/public/base/model_type_test_util.cc b/components/sync/base/model_type_test_util.cc
|
| similarity index 76%
|
| rename from sync/internal_api/public/base/model_type_test_util.cc
|
| rename to components/sync/base/model_type_test_util.cc
|
| index 75500896d57ca90a7be91bd646434861f6e664b6..34bdbd42c9a63f77687cb825f7534623a45fc272 100644
|
| --- a/sync/internal_api/public/base/model_type_test_util.cc
|
| +++ b/components/sync/base/model_type_test_util.cc
|
| @@ -3,7 +3,7 @@
|
| // found in the LICENSE file.
|
|
|
| #include "base/macros.h"
|
| -#include "sync/internal_api/public/base/model_type_test_util.h"
|
| +#include "components/sync/base/model_type_test_util.h"
|
|
|
| namespace syncer {
|
|
|
| @@ -14,17 +14,15 @@ void PrintTo(ModelTypeSet model_types, ::std::ostream* os) {
|
| namespace {
|
|
|
| // Matcher implementation for HasModelTypes().
|
| -class HasModelTypesMatcher
|
| - : public ::testing::MatcherInterface<ModelTypeSet> {
|
| +class HasModelTypesMatcher : public ::testing::MatcherInterface<ModelTypeSet> {
|
| public:
|
| explicit HasModelTypesMatcher(ModelTypeSet expected_types)
|
| : expected_types_(expected_types) {}
|
|
|
| virtual ~HasModelTypesMatcher() {}
|
|
|
| - virtual bool MatchAndExplain(
|
| - ModelTypeSet model_types,
|
| - ::testing::MatchResultListener* listener) const {
|
| + virtual bool MatchAndExplain(ModelTypeSet model_types,
|
| + ::testing::MatchResultListener* listener) const {
|
| // No need to annotate listener since we already define PrintTo().
|
| return model_types == expected_types_;
|
| }
|
| @@ -34,8 +32,7 @@ class HasModelTypesMatcher
|
| }
|
|
|
| virtual void DescribeNegationTo(::std::ostream* os) const {
|
| - *os << "doesn't have model types "
|
| - << ModelTypeSetToString(expected_types_);
|
| + *os << "doesn't have model types " << ModelTypeSetToString(expected_types_);
|
| }
|
|
|
| private:
|
|
|