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

chrome/browser/metrics/metrics_service.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.
 
 // This file defines a service that collects information about the user
 // experience in order to help improve future versions of the app.
 
 #ifndef CHROME_BROWSER_METRICS_METRICS_SERVICE_H_
 #define CHROME_BROWSER_METRICS_METRICS_SERVICE_H_
 #pragma once
@@ skipping 273 matching lines @@
   // current_fetch_ should be reset with its upload data set to a compressed
   // copy of the staged log.
   void PrepareFetchWithStagedLog();
 
   // Implementation of net::URLFetcherDelegate. Called after transmission
   // completes (either successfully or with failure).
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
 
   // 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,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details);
 
   // Reads, increments and then sets the specified integer preference.
   void IncrementPrefValue(const char* path);
 
   // Reads, increments and then sets the specified long preference that is
@@ skipping 83 matching lines @@
   // Google Update statistics, which were retrieved on a blocking pool thread.
   GoogleUpdateMetrics google_update_metrics_;
 
   // The initial log, used to record startup metrics.
   scoped_ptr<MetricsLog> initial_log_;
 
   // The outstanding transmission appears as a URL Fetch operation.
   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_;
 
   // The TCP/UDP echo server to collect network connectivity stats.
   std::string network_stats_server_;
 
   // The HTTP pipelining test server.
   std::string http_pipelining_test_server_;
 
@@ skipping 64 matching lines @@
   friend bool prerender::IsOmniboxEnabled(Profile* profile);
   friend class extensions::ExtensionDownloader;
 
   // Returns true if prefs::kMetricsReportingEnabled is set.
   static bool IsMetricsReportingEnabled();
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(MetricsServiceHelper);
 };
 
 #endif  // CHROME_BROWSER_METRICS_METRICS_SERVICE_H_