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

components/sync_sessions/favicon_cache_unittest.cc

 // Copyright 2013 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/sync_sessions/favicon_cache.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "sync/api/attachments/attachment_id.h"
 #include "sync/api/sync_change_processor_wrapper_for_test.h"
 #include "sync/api/sync_error_factory_mock.h"
 #include "sync/api/time.h"
 #include "sync/internal_api/public/attachments/attachment_service_proxy_for_test.h"
 #include "sync/protocol/favicon_image_specifics.pb.h"
@@ skipping 85 matching lines @@
 }
 
 // TestFaviconData ------------------------------------------------------------
 struct TestFaviconData {
   TestFaviconData() : last_visit_time(0), is_bookmarked(false) {}
   GURL page_url;
   GURL icon_url;
   std::string image_16;
   std::string image_32;
   std::string image_64;
-  int64 last_visit_time;
+  int64_t last_visit_time;
   bool is_bookmarked;
 };
 
 TestFaviconData BuildFaviconData(int index) {
   TestFaviconData data;
   data.page_url = GURL(base::StringPrintf("http://bla.com/%.2i.html", index));
   data.icon_url = GURL(base::StringPrintf("http://bla.com/%.2i.ico", index));
   data.image_16 = base::StringPrintf("16 %i", index);
   // TODO(zea): enable this once the cache supports writing them.
   // data.image_32 = base::StringPrintf("32 %i", index);
@@ skipping 156 matching lines @@
   TestChangeProcessor* processor() { return sync_processor_.get(); }
 
   // Finish an outstanding favicon load for the icon described in |test_data|.
   void OnCustomFaviconDataAvailable(const TestFaviconData& test_data);
 
   // Helper method to run the message loop after invoking
   // OnReceivedSyncFavicon, which posts an internal task.
   void TriggerSyncFaviconReceived(const GURL& page_url,
                                   const GURL& icon_url,
                                   const std::string& icon_bytes,
-                                  int64 last_visit_time_ms);
+                                  int64_t last_visit_time_ms);
 
  private:
   base::MessageLoopForUI message_loop_;
   FaviconCache cache_;
 
   // Our dummy ChangeProcessor used to inspect changes pushed to Sync.
   scoped_ptr<TestChangeProcessor> sync_processor_;
   scoped_ptr<syncer::SyncChangeProcessorWrapperForTest> sync_processor_wrapper_;
 };
 
@@ skipping 138 matching lines @@
     bitmap_result.bitmap_data = temp_string;
     bitmap_results.push_back(bitmap_result);
   }
   cache()->OnFaviconDataAvailable(test_data.page_url, bitmap_results);
 }
 
 void SyncFaviconCacheTest::TriggerSyncFaviconReceived(
     const GURL& page_url,
     const GURL& icon_url,
     const std::string& icon_bytes,
-    int64 last_visit_time_ms) {
+    int64_t last_visit_time_ms) {
   cache()->OnReceivedSyncFavicon(page_url,
                                  icon_url,
                                  icon_bytes,
                                  last_visit_time_ms);
   message_loop_.RunUntilIdle();
 }
 
 // A freshly constructed cache should be empty.
 TEST_F(SyncFaviconCacheTest, Empty) {
   EXPECT_EQ(0U, GetFaviconCount());
@@ skipping 1463 matching lines @@
   EXPECT_EQ(changes[4].change_type(), syncer::SyncChange::ACTION_ADD);
   EXPECT_EQ(changes[4].sync_data().GetDataType(), syncer::FAVICON_TRACKING);
   EXPECT_EQ(kMaxSyncFavicons, GetFaviconId(changes[4]));
   // Expire tracking for favicon[0].
   EXPECT_EQ(changes[5].change_type(), syncer::SyncChange::ACTION_DELETE);
   EXPECT_EQ(changes[5].sync_data().GetDataType(), syncer::FAVICON_TRACKING);
   EXPECT_EQ(0, GetFaviconId(changes[5]));
 }
 
 }  // namespace browser_sync