Switch to standard integer types in net/.

net/ssl/channel_id_service.h

 // 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.
 
 #ifndef NET_SSL_CHANNEL_ID_SERVICE_H_
 #define NET_SSL_CHANNEL_ID_SERVICE_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/time/time.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_export.h"
 #include "net/ssl/channel_id_store.h"
 
 namespace base {
 class TaskRunner;
@@ skipping 99 matching lines @@
   int GetChannelID(const std::string& host,
                    scoped_ptr<crypto::ECPrivateKey>* key,
                    const CompletionCallback& callback,
                    Request* out_req);
 
   // Returns the backing ChannelIDStore.
   ChannelIDStore* GetChannelIDStore();
 
   // Public only for unit testing.
   int channel_id_count();
-  uint64 requests() const { return requests_; }
-  uint64 key_store_hits() const { return key_store_hits_; }
-  uint64 inflight_joins() const { return inflight_joins_; }
-  uint64 workers_created() const { return workers_created_; }
+  uint64_t requests() const { return requests_; }
+  uint64_t key_store_hits() const { return key_store_hits_; }
+  uint64_t inflight_joins() const { return inflight_joins_; }
+  uint64_t workers_created() const { return workers_created_; }
 
  private:
   void GotChannelID(int err,
                     const std::string& server_identifier,
                     scoped_ptr<crypto::ECPrivateKey> key);
   void GeneratedChannelID(
       const std::string& server_identifier,
       int error,
       scoped_ptr<ChannelIDStore::ChannelID> channel_id);
   void HandleResult(int error,
@@ skipping 21 matching lines @@
                       const CompletionCallback& callback,
                       Request* out_req);
 
   scoped_ptr<ChannelIDStore> channel_id_store_;
   scoped_refptr<base::TaskRunner> task_runner_;
 
   // inflight_ maps from a server to an active generation which is taking
   // place.
   std::map<std::string, ChannelIDServiceJob*> inflight_;
 
-  uint64 requests_;
-  uint64 key_store_hits_;
-  uint64 inflight_joins_;
-  uint64 workers_created_;
+  uint64_t requests_;
+  uint64_t key_store_hits_;
+  uint64_t inflight_joins_;
+  uint64_t workers_created_;
 
   base::WeakPtrFactory<ChannelIDService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChannelIDService);
 };
 
 }  // namespace net
 
 #endif  // NET_SSL_CHANNEL_ID_SERVICE_H_