[Metrics] Re-try failed protocol buffer uploads as well as failed XML uploads.

chrome/common/metrics/metrics_log_manager.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 "chrome/common/metrics/metrics_log_manager.h"
 
 #if defined(USE_SYSTEM_LIBBZ2)
 #include <bzlib.h>
 #else
 #include "third_party/bzip2/bzlib.h"
@@ skipping 69 matching lines @@
   if (last_provisional_store_index_ != -1) {
     if (source_type == last_provisional_store_type_ &&
         static_cast<unsigned int>(last_provisional_store_index_) ==
             source_list->size()) {
       last_provisional_store_index_ = -1;
     }
   }
 }
 
 bool MetricsLogManager::has_staged_log() const {
-  return !staged_log_text().empty();
+  return has_staged_log_proto() || has_staged_log_xml();
 }
 
 bool MetricsLogManager::has_staged_log_proto() const {
-  return has_staged_log() && staged_log_text().proto != kDiscardedLog;
+  return
+      !staged_log_text().proto.empty() &&
+      staged_log_text().proto != kDiscardedLog;
 }
 
-void MetricsLogManager::DiscardStagedLog() {
-  staged_log_text_.xml.clear();
-  staged_log_text_.proto.clear();
-  staged_log_type_ = NO_LOG;
+bool MetricsLogManager::has_staged_log_xml() const {
+  return
+      !staged_log_text().xml.empty() &&
+      staged_log_text().xml != kDiscardedLog;
 }
 
 void MetricsLogManager::DiscardStagedLogProto() {
   staged_log_text_.proto = kDiscardedLog;
+
+  // If we're discarding the last piece of the log, reset the staged log state.
+  if (!has_staged_log())
+    DiscardStagedLog();
+}
+
+void MetricsLogManager::DiscardStagedLogXml() {
+  staged_log_text_.xml = kDiscardedLog;
+
+  // If we're discarding the last piece of the log, reset the staged log state.
+  if (!has_staged_log())
+    DiscardStagedLog();
 }
 
 void MetricsLogManager::DiscardCurrentLog() {
   current_log_->CloseLog();
   current_log_.reset();
   current_log_type_ = NO_LOG;
 }
 
 void MetricsLogManager::PauseCurrentLog() {
   DCHECK(!paused_log_.get());
@@ skipping 98 matching lines @@
     DVLOG(1) << "METRICS LOG: " << log_text;
 
     // Note that we only save the protobuf version if we succeeded in
     // compressing the XML, so that the two data streams are the same.
     current_log_->GetEncodedLogProto(&(compressed_log->proto));
   } else {
     NOTREACHED() << "Failed to compress log for transmission.";
   }
 }
 
+void MetricsLogManager::DiscardStagedLog() {
+  staged_log_text_.xml.clear();
+  staged_log_text_.proto.clear();
+  staged_log_type_ = NO_LOG;
+}
+
 // static
 // This implementation is based on the Firefox MetricsService implementation.
 bool MetricsLogManager::Bzip2Compress(const std::string& input,
                                       std::string* output) {
   bz_stream stream = {0};
   // As long as our input is smaller than the bzip2 block size, we should get
   // the best compression.  For example, if your input was 250k, using a block
   // size of 300k or 500k should result in the same compression ratio.  Since
   // our data should be under 100k, using the minimum block size of 100k should
   // allocate less temporary memory, but result in the same compression ratio.
@@ skipping 22 matching lines @@
     // TODO(jar): See if it would be better to do a CHECK() here.
     return false;
   }
   result = BZ2_bzCompressEnd(&stream);
   DCHECK(result == BZ_OK);
 
   output->resize(stream.total_out_lo32);
 
   return true;
 }