Finish decoupling sync and invalidations

components/invalidation/object_id_invalidation_map_test_util.cc

 // Copyright 2014 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 "components/invalidation/object_id_invalidation_map_test_util.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 
@@ skipping 21 matching lines @@
  private:
   const ObjectIdInvalidationMap expected_;
 
   DISALLOW_COPY_AND_ASSIGN(ObjectIdInvalidationMapEqMatcher);
 };
 
 ObjectIdInvalidationMapEqMatcher::ObjectIdInvalidationMapEqMatcher(
     const ObjectIdInvalidationMap& expected) : expected_(expected) {
 }
 
-namespace {
-
 struct InvalidationEqPredicate {
   InvalidationEqPredicate(const Invalidation& inv1)
       : inv1_(inv1) { }
 
   bool operator()(const Invalidation& inv2) {
     return inv1_.Equals(inv2);
   }
 
   const Invalidation& inv1_;
 };
 
-}
-
 bool ObjectIdInvalidationMapEqMatcher::MatchAndExplain(
     const ObjectIdInvalidationMap& actual,
     MatchResultListener* listener) const {
 
   std::vector<syncer::Invalidation> expected_invalidations;
   std::vector<syncer::Invalidation> actual_invalidations;
 
   expected_.GetAllInvalidations(&expected_invalidations);
   actual.GetAllInvalidations(&actual_invalidations);
 
@@ skipping 52 matching lines @@
 }
 
 }  // namespace
 
 Matcher<const ObjectIdInvalidationMap&> Eq(
     const ObjectIdInvalidationMap& expected) {
   return MakeMatcher(new ObjectIdInvalidationMapEqMatcher(expected));
 }
 
 }  // namespace syncer