[Sync] Move model_type* from syncable/ to base/

sync/internal_api/public/syncable/model_type_test_util.cc

Index: sync/internal_api/public/syncable/model_type_test_util.cc
diff --git a/sync/internal_api/public/syncable/model_type_test_util.cc b/sync/internal_api/public/syncable/model_type_test_util.cc
deleted file mode 100644
index 0ceaab26951fab6b6b772ef2bf0ea1525e1a810c..0000000000000000000000000000000000000000
--- a/sync/internal_api/public/syncable/model_type_test_util.cc
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "sync/internal_api/public/syncable/model_type_test_util.h"
-
-namespace syncer {
-namespace syncable {
-
-void PrintTo(ModelTypeSet model_types, ::std::ostream* os) {
-  *os << ModelTypeSetToString(model_types);
-}
-
-namespace {
-
-// Matcher implementation for HasModelTypes().
-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 {
-    // No need to annotate listener since we already define PrintTo().
-    return model_types.Equals(expected_types_);
-  }
-
-  virtual void DescribeTo(::std::ostream* os) const {
-    *os << "has model types " << ModelTypeSetToString(expected_types_);
-  }
-
-  virtual void DescribeNegationTo(::std::ostream* os) const {
-    *os << "doesn't have model types "
-        << ModelTypeSetToString(expected_types_);
-  }
-
- private:
-  const ModelTypeSet expected_types_;
-
-  DISALLOW_COPY_AND_ASSIGN(HasModelTypesMatcher);
-};
-
-}  // namespace
-
-::testing::Matcher<ModelTypeSet> HasModelTypes(ModelTypeSet expected_types) {
-  return ::testing::MakeMatcher(new HasModelTypesMatcher(expected_types));
-}
-
-}  // namespace syncable
-}  // namespace syncer