Upload UMA data using protocol buffers.

chrome_frame/metrics_service.cc

 // 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.
 
 //------------------------------------------------------------------------------
 // Description of the life cycle of a instance of MetricsService.
 //
 //  OVERVIEW
 //
 // A MetricsService instance is created at ChromeFrame startup in
@@ skipping 401 matching lines @@
 
   DCHECK(log_manager_.has_staged_log());
 }
 
 bool MetricsService::TransmissionPermitted() const {
   // If the user forbids uploading that's their business, and we don't upload
   // anything.
   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());
 
   if (!GetInstance()->TransmissionPermitted())
     return false;
 
   static long currently_uploading = 0;
   if (InterlockedCompareExchange(&currently_uploading, 1, 0)) {
     DVLOG(1) << "Contention for uploading metrics data. Backing off";
     return false;
   }
 
   MakePendingLog();
   DCHECK(log_manager_.has_staged_log());
 
   bool ret = true;
 
   if (log_manager_.staged_log_text().empty()) {
     NOTREACHED() << "Failed to compress log for transmission.";
     ret = false;
   } else {
     HRESULT hr = ChromeFrameMetricsDataUploader::UploadDataHelper(
-        log_manager_.staged_log_text());
+        log_manager_.staged_log_text().xml);
     DCHECK(SUCCEEDED(hr));
   }
   log_manager_.DiscardStagedLog();
 
   currently_uploading = 0;
   return ret;
 }
 
 // static
 std::string MetricsService::GetVersionString() {
   chrome::VersionInfo version_info;
   if (version_info.is_valid()) {
     std::string version = version_info.Version();
     // Add the -F extensions to ensure that UMA data uploaded by ChromeFrame
     // lands in the ChromeFrame bucket.
     version += "-F";
     if (!version_info.IsOfficialBuild())
       version.append("-devel");
     return version;
   } else {
     NOTREACHED() << "Unable to retrieve version string.";
   }
 
   return std::string();
 }