summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorisherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-29 01:29:58 +0000
committerisherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-29 01:29:58 +0000
commitfe58acc2305c2026a0a01195808dad673216e054 (patch)
tree11336990ae08d9342cedc670a769fe482b68160c /chrome_frame
parent1d4d298a3fbde30d37b20a2f3aa2d99bd500449d (diff)
downloadchromium_src-fe58acc2305c2026a0a01195808dad673216e054.zip
chromium_src-fe58acc2305c2026a0a01195808dad673216e054.tar.gz
chromium_src-fe58acc2305c2026a0a01195808dad673216e054.tar.bz2
Upload UMA data using protocol buffers.
For now, we will also preserve the existing XML upload system, so that there is no risk of data loss. Previously committed as [ https://chromiumcodereview.appspot.com/9232071/ ]. This fixes the ChromiumOS compile. BUG=109817 TEST=unit tested TBR=jar@chromium.org Review URL: https://chromiumcodereview.appspot.com/9474041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124086 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/metrics_service.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome_frame/metrics_service.cc b/chrome_frame/metrics_service.cc
index 01e3c50..622a892 100644
--- a/chrome_frame/metrics_service.cc
+++ b/chrome_frame/metrics_service.cc
@@ -419,6 +419,8 @@ bool MetricsService::TransmissionPermitted() const {
return user_permits_upload_;
}
+// TODO(isherman): Update this to log to the protobuf server as well...
+// http://crbug.com/109817
bool MetricsService::UploadData() {
DCHECK_EQ(thread_, base::PlatformThread::CurrentId());
@@ -441,7 +443,7 @@ bool MetricsService::UploadData() {
ret = false;
} else {
HRESULT hr = ChromeFrameMetricsDataUploader::UploadDataHelper(
- log_manager_.staged_log_text());
+ log_manager_.staged_log_text().xml);
DCHECK(SUCCEEDED(hr));
}
log_manager_.DiscardStagedLog();