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

chrome/common/metrics/metrics_log_manager.h

Index: chrome/common/metrics/metrics_log_manager.h
diff --git a/chrome/common/metrics/metrics_log_manager.h b/chrome/common/metrics/metrics_log_manager.h
index 982332225eb444e47a27f7117e0662f354ec5df4..e3b451300e6dc7b97754b1f340dc1fc0bf8d8d7a 100644
--- a/chrome/common/metrics/metrics_log_manager.h
+++ b/chrome/common/metrics/metrics_log_manager.h
@@ -70,23 +70,30 @@ class MetricsLogManager {
 
   // 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();
 
@@ -165,6 +172,9 @@ class MetricsLogManager {
   // 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);