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

components/invalidation/impl/invalidation_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/invalidation_test_util.h"
 
-#include "base/basictypes.h"
 #include "base/json/json_writer.h"
 #include "base/json/string_escape.h"
+#include "base/macros.h"
 #include "base/values.h"
 #include "components/invalidation/public/invalidation.h"
 
 namespace syncer {
 
 using ::testing::MakeMatcher;
 using ::testing::MatchResultListener;
 using ::testing::Matcher;
 using ::testing::MatcherInterface;
 using ::testing::PrintToString;
@@ skipping 90 matching lines @@
 
 void PrintTo(const Invalidation& inv, ::std::ostream* os) {
   *os << "{ payload: " << inv.ToString() << " }";
 }
 
 Matcher<const Invalidation&> Eq(const Invalidation& expected) {
   return MakeMatcher(new InvalidationEqMatcher(expected));
 }
 
 }  // namespace syncer