Prep for moving files into components/invalidation

sync/internal_api/public/base/invalidation_util.h

Index: sync/internal_api/public/base/invalidation_util.h
diff --git a/sync/internal_api/public/base/invalidation_util.h b/sync/internal_api/public/base/invalidation_util.h
index 5951ad8067b0dd9f543cb6f8190b9192602c8ba8..2de2d20e59abc73654ca4e3707e80da672ea57d0 100644
--- a/sync/internal_api/public/base/invalidation_util.h
+++ b/sync/internal_api/public/base/invalidation_util.h
@@ -7,14 +7,12 @@
 #ifndef SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATION_UTIL_H_
 #define SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATION_UTIL_H_
 
-#include <iosfwd>
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "sync/base/sync_export.h"
-#include "sync/internal_api/public/base/model_type.h"
 
 namespace base {
 class DictionaryValue;
@@ -25,10 +23,6 @@ namespace invalidation {
 class Invalidation;
 class ObjectId;
 
-// Gmock print helper
-SYNC_EXPORT_PRIVATE void PrintTo(const invalidation::ObjectId& id,
-                                 std::ostream* os);
-
 }  // namespace invalidation
 
 namespace syncer {
@@ -50,12 +44,6 @@ typedef std::set<invalidation::ObjectId, ObjectIdLessThan> ObjectIdSet;
 typedef std::map<invalidation::ObjectId, int, ObjectIdLessThan>
     ObjectIdCountMap;
 
-SYNC_EXPORT bool RealModelTypeToObjectId(ModelType model_type,
-                                         invalidation::ObjectId* object_id);
-
-bool ObjectIdToRealModelType(const invalidation::ObjectId& object_id,
-                             ModelType* model_type);
-
 // Caller owns the returned DictionaryValue.
 scoped_ptr<base::DictionaryValue> ObjectIdToValue(
     const invalidation::ObjectId& object_id);
@@ -66,12 +54,6 @@ bool ObjectIdFromValue(const base::DictionaryValue& value,
 SYNC_EXPORT_PRIVATE std::string ObjectIdToString(
     const invalidation::ObjectId& object_id);
 
-SYNC_EXPORT_PRIVATE ObjectIdSet ModelTypeSetToObjectIdSet(ModelTypeSet models);
-ModelTypeSet ObjectIdSetToModelTypeSet(const ObjectIdSet& ids);
-
-std::string InvalidationToString(
-    const invalidation::Invalidation& invalidation);
-
 }  // namespace syncer
 
 #endif  // SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATION_UTIL_H_