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

chrome/browser/metrics/metrics_service.h

Index: chrome/browser/metrics/metrics_service.h
diff --git a/chrome/browser/metrics/metrics_service.h b/chrome/browser/metrics/metrics_service.h
index 97da63ae4baeac0794a1c820890db4df038275c3..364c3f7bc98ef0efcebcc20e8ff4ce3565d3e9c5 100644
--- a/chrome/browser/metrics/metrics_service.h
+++ b/chrome/browser/metrics/metrics_service.h
@@ -291,7 +291,7 @@ class MetricsService
 
   // Logs debugging details, for the case where the server returns a response
   // code other than 200.
-  void LogBadResponseCode();
+  void LogBadResponseCode(int response_code, bool is_xml);
 
   // Records a window-related notification.
   void LogWindowChange(int type,
@@ -395,12 +395,6 @@ class MetricsService
   scoped_ptr<net::URLFetcher> current_fetch_xml_;
   scoped_ptr<net::URLFetcher> current_fetch_proto_;
 
-  // Cached responses from the XML request while we wait for a response to the
-  // protubuf request.
-  int response_code_;
-  std::string response_status_;
-  std::string response_data_;
-
   // The URLs for the XML and protobuf metrics servers.
   string16 server_url_xml_;
   string16 server_url_proto_;
@@ -453,7 +447,7 @@ class MetricsService
 
   // Indicates that an asynchronous reporting step is running.
   // This is used only for debugging.
-  bool waiting_for_asynchronus_reporting_step_;
+  bool waiting_for_asynchronous_reporting_step_;
 
 #if defined(OS_CHROMEOS)
   // The external metric service is used to log ChromeOS UMA events.