Switch to standard integer types in components/, part 2 of 4.

components/invalidation/impl/unacked_invalidation_set_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/impl/unacked_invalidation_set_test_util.h"
 
 #include "base/json/json_string_value_serializer.h"
+#include "base/macros.h"
 #include "components/invalidation/public/object_id_invalidation_map.h"
 #include "testing/gmock/include/gmock/gmock-matchers.h"
 
 namespace syncer {
 
 using ::testing::MakeMatcher;
 using ::testing::MatchResultListener;
 using ::testing::Matcher;
 using ::testing::MatcherInterface;
 using ::testing::PrintToString;
@@ skipping 156 matching lines @@
 }
 
 Matcher<const UnackedInvalidationsMap&> Eq(
     const UnackedInvalidationsMap& expected) {
   return MakeMatcher(new UnackedInvalidationsMapEqMatcher(expected));
 }
 
 }  // namespace test_util
 
 };