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

chrome/common/metrics/metrics_log_manager.h

 // 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.
 
 #ifndef CHROME_COMMON_METRICS_METRICS_LOG_MANAGER_H_
 #define CHROME_COMMON_METRICS_METRICS_LOG_MANAGER_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 52 matching lines @@
 
   // Populates staged_log_text() with the next stored log to send.
   // Should only be called if has_unsent_logs() is true.
   void StageNextLogForUpload();
 
   // Returns true if there is a log that needs to be, or is being, uploaded.
   bool has_staged_log() const;
 
   // Returns true if there is a protobuf log that needs to be uploaded.
   // In the case that an XML upload needs to be re-issued due to a previous
-  // failure, has_staged_log() will return true while this returns false.
+  // failure, has_staged_log() can return true while this returns false.
   bool has_staged_log_proto() const;
 
+  // Returns true if there is an xml log that needs to be uploaded.
+  // In the case that a protobuf upload needs to be re-issued due to a previous
+  // failure, has_staged_log() can return true while this returns false.
+  bool has_staged_log_xml() const;
+
   // The text of the staged log, in compressed XML or protobuf format. Empty if
   // there is no staged log, or if compression of the staged log failed.
   const SerializedLog& staged_log_text() const {
     return staged_log_text_;
   }
 
-  // Discards the staged log (both the XML and the protobuf data).
-  void DiscardStagedLog();
-
   // Discards the protobuf data in the staged log.
   // This is useful to prevent needlessly re-issuing successful protobuf uploads
   // due to XML upload failures.
   void DiscardStagedLogProto();
 
+  // Discards the XML data in the staged log.
+  // This is useful to prevent needlessly re-issuing successful XML uploads
+  // due to protobuf upload failures.
+  void DiscardStagedLogXml();
+
   // Closes and discards |current_log|.
   void DiscardCurrentLog();
 
   // Sets current_log to NULL, but saves the current log for future use with
   // ResumePausedLog(). Only one log may be paused at a time.
   // TODO(stuartmorgan): Pause/resume support is really a workaround for a
   // design issue in initial log writing; that should be fixed, and pause/resume
   // removed.
   void PauseCurrentLog();
 
@@ skipping 58 matching lines @@
   // |max_ongoing_log_store_size_|).
   // NOTE: This clears the contents of |log_text| (to avoid an expensive
   // string copy), so the log should be discarded after this call.
   void StoreLog(SerializedLog* log_text,
                 LogType log_type,
                 StoreType store_type);
 
   // Compresses current_log_ into compressed_log.
   void CompressCurrentLog(SerializedLog* compressed_log);
 
+  // Discards the staged log (both the XML and the protobuf data).
+  void DiscardStagedLog();
+
   // Compresses the text in |input| using bzip2, store the result in |output|.
   static bool Bzip2Compress(const std::string& input, std::string* output);
 
   // The log that we are still appending to.
   scoped_ptr<MetricsLogBase> current_log_;
   LogType current_log_type_;
 
   // A paused, previously-current log.
   scoped_ptr<MetricsLogBase> paused_log_;
   LogType paused_log_type_;
@@ skipping 24 matching lines @@
   // This is necessary because during an upload there are two logs (staged
   // and current) and a client might store them in either order, so it's
   // not necessarily the case that the provisional store is the last store.
   int last_provisional_store_index_;
   LogType last_provisional_store_type_;
 
   DISALLOW_COPY_AND_ASSIGN(MetricsLogManager);
 };
 
 #endif  // CHROME_COMMON_METRICS_METRICS_LOG_MANAGER_H_