C++ Readability review for holte

components/rappor/log_uploader.cc

 // 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.
 
+// Change for readability
+
 #include "components/rappor/log_uploader.h"
 
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_fetcher.h"
 
 namespace {
 
 // The delay, in seconds, between uploading when there are queued logs to send.
@@ skipping 80 matching lines @@
   return interval > max_interval ? max_interval : interval;
 }
 
 void LogUploader::OnURLFetchComplete(const net::URLFetcher* source) {
   // We're not allowed to re-use the existing |URLFetcher|s, so free them here.
   // Note however that |source| is aliased to the fetcher, so we should be
   // careful not to delete it too early.
   DCHECK_EQ(current_fetch_.get(), source);
   scoped_ptr<net::URLFetcher> fetch(current_fetch_.Pass());
 
-  int response_code = source->GetResponseCode();
+  const int response_code = source->GetResponseCode();
 
   // Log a histogram to track response success vs. failure rates.
   UMA_HISTOGRAM_SPARSE_SLOWLY("Rappor.UploadResponseCode", response_code);
 
-  bool upload_succeeded = response_code == 200;
+  const bool upload_succeeded = response_code == 200;
 
   // Determine whether this log should be retransmitted.
   DiscardReason reason = NUM_DISCARD_REASONS;
   if (upload_succeeded) {
     reason = UPLOAD_SUCCESS;
   } else if (response_code == 400) {
     reason = UPLOAD_REJECTED;
   } else if (queued_logs_.size() > kMaxQueuedLogs) {
     reason = QUEUE_OVERFLOW;
   }
 
   if (reason != NUM_DISCARD_REASONS) {
     UMA_HISTOGRAM_ENUMERATION("Rappor.DiscardReason",
                               reason,
                               NUM_DISCARD_REASONS);
     queued_logs_.pop();
   }
 
   // Error 400 indicates a problem with the log, not with the server, so
   // don't consider that a sign that the server is in trouble.
-  bool server_is_healthy = upload_succeeded || response_code == 400;
+  const bool server_is_healthy = upload_succeeded || response_code == 400;
   OnUploadFinished(server_is_healthy, !queued_logs_.empty());
 }
 
 void LogUploader::OnUploadFinished(bool server_is_healthy,
                                    bool more_logs_remaining) {
   DCHECK(has_callback_pending_);
   has_callback_pending_ = false;
   // If the server is having issues, back off. Otherwise, reset to default.
   if (!server_is_healthy)
     upload_interval_ = BackOffUploadInterval(upload_interval_);
   else
     upload_interval_ = base::TimeDelta::FromSeconds(kUnsentLogsIntervalSeconds);
 
   if (more_logs_remaining)
     ScheduleNextUpload(upload_interval_);
 }
 
 }  // namespace rappor