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

components/sync_sessions/favicon_cache.h

 // 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.
 
 #ifndef COMPONENTS_SYNC_SESSIONS_FAVICON_CACHE_H_
 #define COMPONENTS_SYNC_SESSIONS_FAVICON_CACHE_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_observer.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "components/history/core/browser/history_service_observer.h"
 #include "components/history/core/browser/history_types.h"
 #include "components/sessions/core/session_id.h"
@@ skipping 72 matching lines @@
   // If no favicon exists associated with |favicon_url|, triggers a load
   // for the favicon associated with |page_url|.
   void OnFaviconVisited(const GURL& page_url, const GURL& favicon_url);
 
   // Consume Session sync favicon data. Will not overwrite existing favicons.
   // If |icon_bytes| is empty, only updates the page->favicon url mapping.
   // Safe to call within a transaction.
   void OnReceivedSyncFavicon(const GURL& page_url,
                              const GURL& icon_url,
                              const std::string& icon_bytes,
-                             int64 visit_time_ms);
+                             int64_t visit_time_ms);
 
  private:
   friend class SyncFaviconCacheTest;
   FRIEND_TEST_ALL_PREFIXES(SyncFaviconCacheTest, HistoryFullClear);
   FRIEND_TEST_ALL_PREFIXES(SyncFaviconCacheTest, HistorySubsetClear);
 
   // Functor for ordering SyncedFaviconInfo objects by recency;
   struct FaviconRecencyFunctor {
     bool operator()(const linked_ptr<SyncedFaviconInfo>& lhs,
                     const linked_ptr<SyncedFaviconInfo>& rhs) const;
   };
 
 
   // Map of favicon url to favicon image.
   typedef std::map<GURL, linked_ptr<SyncedFaviconInfo> > FaviconMap;
   typedef std::set<linked_ptr<SyncedFaviconInfo>,
                    FaviconRecencyFunctor> RecencySet;
   // Map of page url to task id (for favicon loading).
   typedef std::map<GURL, base::CancelableTaskTracker::TaskId> PageTaskMap;
   // Map of page url to favicon url.
   typedef std::map<GURL, GURL> PageFaviconMap;
 
   // Helper method to perform OnReceivedSyncFavicon work without worrying about
   // whether caller holds a sync transaction.
   void OnReceivedSyncFaviconImpl(const GURL& icon_url,
                                  const std::string& icon_bytes,
-                                 int64 visit_time_ms);
+                                 int64_t visit_time_ms);
 
   // Callback method to store a tab's favicon into its sync node once it becomes
   // available. Does nothing if no favicon data was available.
   void OnFaviconDataAvailable(
       const GURL& page_url,
       const std::vector<favicon_base::FaviconRawBitmapResult>& bitmap_result);
 
   // Helper method to update the sync state of the favicon at |icon_url|. If
   // either |image_change_type| or |tracking_change_type| is ACTION_INVALID,
   // the corresponding datatype won't be updated.
@@ skipping 97 matching lines @@
 
   // Weak pointer factory for favicon loads.
   base::WeakPtrFactory<FaviconCache> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconCache);
 };
 
 }  // namespace browser_sync
 
 #endif  // COMPONENTS_SYNC_SESSIONS_FAVICON_CACHE_H_