Switch to standard integer types in content/.

content/child/resource_dispatcher_unittest.cc

 // Copyright (c) 2012 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 <stddef.h>
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/shared_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/process_handle.h"
 #include "base/run_loop.h"
 #include "base/stl_util.h"
@@ skipping 33 matching lines @@
          received_response_(false),
          total_encoded_data_length_(0),
          total_downloaded_data_length_(0),
          complete_(false),
          dispatcher_(dispatcher),
          request_id_(0) {
   }
 
   void set_request_id(int request_id) { request_id_ = request_id; }
 
-  void OnUploadProgress(uint64 position, uint64 size) override {}
+  void OnUploadProgress(uint64_t position, uint64_t size) override {}
 
   bool OnReceivedRedirect(const net::RedirectInfo& redirect_info,
                           const ResourceResponseInfo& info) override {
     ++seen_redirects_;
     if (defer_on_redirect_)
       dispatcher_->SetDefersLoading(request_id_, true);
     return follow_redirects_;
   }
 
   void OnReceivedResponse(const ResourceResponseInfo& info) override {
@@ skipping 13 matching lines @@
     EXPECT_FALSE(complete_);
     data_.append(data->payload(), data->length());
     total_encoded_data_length_ += data->encoded_length();
   }
 
   void OnCompletedRequest(int error_code,
                           bool was_ignored_by_handler,
                           bool stale_copy_in_cache,
                           const std::string& security_info,
                           const base::TimeTicks& completion_time,
-                          int64 total_transfer_size) override {
+                          int64_t total_transfer_size) override {
     EXPECT_TRUE(received_response_);
     EXPECT_FALSE(complete_);
     complete_ = true;
   }
 
   void OnReceivedCompletedResponse(const ResourceResponseInfo& info,
                                    scoped_ptr<ReceivedData> data,
                                    int error_code,
                                    bool was_ignored_by_handler,
                                    bool stale_copy_in_cache,
                                    const std::string& security_info,
                                    const base::TimeTicks& completion_time,
-                                   int64 total_transfer_size) override {
+                                   int64_t total_transfer_size) override {
     bool cancel_on_receive_response = cancel_on_receive_response_;
     OnReceivedResponse(info);
     if (cancel_on_receive_response)
       return;
     if (data)
       OnReceivedData(data.Pass());
     OnCompletedRequest(error_code, was_ignored_by_handler, stale_copy_in_cache,
                        security_info, completion_time, total_transfer_size);
   }
 
@@ skipping 616 matching lines @@
   void PerformTest(const ResourceResponseHead& response_head) {
     scoped_ptr<RequestInfo> request_info(CreateRequestInfo(false));
     TestRequestPeer peer(dispatcher());
     dispatcher()->StartAsync(*request_info.get(), NULL, &peer);
 
     dispatcher()->OnMessageReceived(
         ResourceMsg_ReceivedResponse(0, response_head));
   }
 
   // RequestPeer methods.
-  void OnUploadProgress(uint64 position, uint64 size) override {}
+  void OnUploadProgress(uint64_t position, uint64_t size) override {}
 
   bool OnReceivedRedirect(const net::RedirectInfo& redirect_info,
                           const ResourceResponseInfo& info) override {
     return true;
   }
 
   void OnReceivedResponse(const ResourceResponseInfo& info) override {
     response_info_ = info;
   }
 
   void OnDownloadedData(int len, int encoded_data_length) override {}
 
   void OnReceivedData(scoped_ptr<ReceivedData> data) override {}
 
   void OnCompletedRequest(int error_code,
                           bool was_ignored_by_handler,
                           bool stale_copy_in_cache,
                           const std::string& security_info,
                           const base::TimeTicks& completion_time,
-                          int64 total_transfer_size) override {}
+                          int64_t total_transfer_size) override {}
 
   void OnReceivedCompletedResponse(const ResourceResponseInfo& info,
                                    scoped_ptr<ReceivedData> data,
                                    int error_code,
                                    bool was_ignored_by_handler,
                                    bool stale_copy_in_cache,
                                    const std::string& security_info,
                                    const base::TimeTicks& completion_time,
-                                   int64 total_transfer_size) override {}
+                                   int64_t total_transfer_size) override {}
 
   const ResourceResponseInfo& response_info() const { return response_info_; }
 
  private:
   ResourceResponseInfo response_info_;
 };
 
 // TODO(simonjam): Enable this when 10829031 lands.
 TEST_F(TimeConversionTest, DISABLED_ProperlyInitialized) {
   ResourceResponseHead response_head;
@@ skipping 30 matching lines @@
   ResourceResponseHead response_head;
 
   PerformTest(response_head);
 
   EXPECT_EQ(base::TimeTicks(), response_info().load_timing.request_start);
   EXPECT_EQ(base::TimeTicks(),
             response_info().load_timing.connect_timing.dns_start);
 }
 
 }  // namespace content