Switch to standard integer types in sync/.

sync/internal_api/http_bridge.cc

 // Copyright 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 "sync/internal_api/public/http_bridge.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "net/base/load_flags.h"
@@ skipping 23 matching lines @@
 void LogTimeout(bool timed_out) {
   UMA_HISTOGRAM_BOOLEAN("Sync.URLFetchTimedOut", timed_out);
 }
 
 bool IsSyncHttpContentCompressionEnabled() {
   const std::string group_name =
       base::FieldTrialList::FindFullName("SyncHttpContentCompression");
   return StartsWith(group_name, "Enabled", base::CompareCase::SENSITIVE);
 }
 
-void RecordSyncRequestContentLengthHistograms(int64 compressed_content_length,
-                                              int64 original_content_length) {
+void RecordSyncRequestContentLengthHistograms(int64_t compressed_content_length,
+                                              int64_t original_content_length) {
   UMA_HISTOGRAM_COUNTS("Sync.RequestContentLength.Compressed",
                        compressed_content_length);
   UMA_HISTOGRAM_COUNTS("Sync.RequestContentLength.Original",
                        original_content_length);
 }
 
-void RecordSyncResponseContentLengthHistograms(int64 compressed_content_length,
-                                               int64 original_content_length) {
+void RecordSyncResponseContentLengthHistograms(
+    int64_t compressed_content_length,
+    int64_t original_content_length) {
   UMA_HISTOGRAM_COUNTS("Sync.ResponseContentLength.Compressed",
                        compressed_content_length);
   UMA_HISTOGRAM_COUNTS("Sync.ResponseContentLength.Original",
                        original_content_length);
 }
 
 // -----------------------------------------------------------------------------
 // The rest of the code in the anon namespace is copied from
 // components/compression/compression_utils.cc
 // TODO(gangwu): crbug.com/515695. The following code is copied from
@@ skipping 249 matching lines @@
   DCHECK(request_context_getter_.get());
   fetch_state_.start_time = base::Time::Now();
   fetch_state_.url_poster =
       net::URLFetcher::Create(url_for_request_, net::URLFetcher::POST, this)
           .release();
   if (!bind_to_tracker_callback_.is_null())
     bind_to_tracker_callback_.Run(fetch_state_.url_poster);
   fetch_state_.url_poster->SetRequestContext(request_context_getter_.get());
   fetch_state_.url_poster->SetExtraRequestHeaders(extra_headers_);
 
-  int64 compressed_content_size = 0;
+  int64_t compressed_content_size = 0;
   if (IsSyncHttpContentCompressionEnabled()) {
     std::string compressed_request_content;
     GzipCompress(request_content_, &compressed_request_content);
     compressed_content_size = compressed_request_content.size();
     fetch_state_.url_poster->SetUploadData(content_type_,
                                            compressed_request_content);
     fetch_state_.url_poster->AddExtraRequestHeader("Content-Encoding: gzip");
   } else {
     fetch_state_.url_poster->SetUploadData(content_type_, request_content_);
     fetch_state_.url_poster->AddExtraRequestHeader(base::StringPrintf(
@@ skipping 105 matching lines @@
   // Use a real (non-debug) log to facilitate troubleshooting in the wild.
   VLOG(2) << "HttpBridge::OnURLFetchComplete for: "
           << fetch_state_.url_poster->GetURL().spec();
   VLOG(1) << "HttpBridge received response code: "
           << fetch_state_.http_response_code;
 
   source->GetResponseAsString(&fetch_state_.response_content);
   fetch_state_.response_headers = source->GetResponseHeaders();
   UpdateNetworkTime();
 
-  int64 compressed_content_length = fetch_state_.response_content.size();
-  int64 original_content_length = compressed_content_length;
+  int64_t compressed_content_length = fetch_state_.response_content.size();
+  int64_t original_content_length = compressed_content_length;
   if (fetch_state_.response_headers &&
       fetch_state_.response_headers->HasHeaderValue("content-encoding",
                                                     "gzip")) {
     compressed_content_length =
         fetch_state_.response_headers->GetContentLength();
   }
   RecordSyncResponseContentLengthHistograms(compressed_content_length,
                                             original_content_length);
 
   // End of the line for url_poster_. It lives only on the IO loop.
   // We defer deletion because we're inside a callback from a component of the
   // URLFetcher, so it seems most natural / "polite" to let the stack unwind.
   base::MessageLoop::current()->DeleteSoon(FROM_HERE, fetch_state_.url_poster);
   fetch_state_.url_poster = NULL;
 
   // Wake the blocked syncer thread in MakeSynchronousPost.
   // WARNING: DONT DO ANYTHING AFTER THIS CALL! |this| may be deleted!
   http_post_completed_.Signal();
 }
 
 void HttpBridge::OnURLFetchDownloadProgress(const net::URLFetcher* source,
-                                            int64 current, int64 total) {
+                                            int64_t current,
+                                            int64_t total) {
   DCHECK(network_task_runner_->BelongsToCurrentThread());
   // Reset the delay when forward progress is made.
   base::AutoLock lock(fetch_state_lock_);
   if (fetch_state_.http_request_timeout_timer.get())
     fetch_state_.http_request_timeout_timer->Reset();
 }
 
 void HttpBridge::OnURLFetchUploadProgress(const net::URLFetcher* source,
-                                          int64 current, int64 total) {
+                                          int64_t current,
+                                          int64_t total) {
   DCHECK(network_task_runner_->BelongsToCurrentThread());
   // Reset the delay when forward progress is made.
   base::AutoLock lock(fetch_state_lock_);
   if (fetch_state_.http_request_timeout_timer.get())
     fetch_state_.http_request_timeout_timer->Reset();
 }
 
 void HttpBridge::OnURLFetchTimedOut() {
   DCHECK(network_task_runner_->BelongsToCurrentThread());
 
@@ skipping 32 matching lines @@
 void HttpBridge::UpdateNetworkTime() {
   std::string sane_time_str;
   if (!fetch_state_.request_succeeded || fetch_state_.start_time.is_null() ||
       fetch_state_.end_time < fetch_state_.start_time ||
       !fetch_state_.response_headers ||
       !fetch_state_.response_headers->EnumerateHeader(NULL, "Sane-Time-Millis",
                                                       &sane_time_str)) {
     return;
   }
 
-  int64 sane_time_ms = 0;
+  int64_t sane_time_ms = 0;
   if (base::StringToInt64(sane_time_str, &sane_time_ms)) {
     network_time_update_callback_.Run(
         base::Time::FromJsTime(sane_time_ms),
         base::TimeDelta::FromMilliseconds(1),
         fetch_state_.end_time - fetch_state_.start_time);
   }
 }
 
 }  // namespace syncer