Make compression optional in TraceUploader.

chrome/browser/tracing/crash_service_uploader.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/tracing/crash_service_uploader.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/format_macros.h"
@@ skipping 84 matching lines @@
 
   if (progress_callback_.is_null())
     return;
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(progress_callback_, current, total));
 }
 
 void TraceCrashServiceUploader::DoUpload(
     const std::string& file_contents,
+    UploadMode upload_mode,
     scoped_ptr<base::DictionaryValue> metadata,
     const UploadProgressCallback& progress_callback,
     const UploadDoneCallback& done_callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   content::BrowserThread::PostTask(
       content::BrowserThread::FILE, FROM_HERE,
       base::Bind(&TraceCrashServiceUploader::DoUploadOnFileThread,
-                 base::Unretained(this), file_contents, upload_url_,
-                 base::Passed(metadata.Pass()), progress_callback,
+                 base::Unretained(this), file_contents, upload_mode,
+                 upload_url_, base::Passed(metadata.Pass()), progress_callback,
                  done_callback));
 }
 
 void TraceCrashServiceUploader::DoUploadOnFileThread(
     const std::string& file_contents,
+    UploadMode upload_mode,
     const std::string& upload_url,
     scoped_ptr<base::DictionaryValue> metadata,
     const UploadProgressCallback& progress_callback,
     const UploadDoneCallback& done_callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
   DCHECK(!url_fetcher_.get());
 
   progress_callback_ = progress_callback;
   done_callback_ = done_callback;
 
@@ skipping 28 matching lines @@
     version = product_components[1];
   } else {
     version = "unknown";
   }
 
   if (url_fetcher_.get()) {
     OnUploadError("Already uploading.");
     return;
   }
 
-  scoped_ptr<char[]> compressed_contents(new char[kMaxUploadBytes]);
-  int compressed_bytes;
-  if (!Compress(file_contents, kMaxUploadBytes, compressed_contents.get(),
-                &compressed_bytes)) {
-    OnUploadError("Compressing file failed.");
-    return;
+  std::string compressed_contents;
+  if (upload_mode == COMPRESSED_UPLOAD) {
+    scoped_ptr<char[]> compressed_buffer(new char[kMaxUploadBytes]);
+    int compressed_bytes;
+    if (!Compress(file_contents, kMaxUploadBytes, compressed_buffer.get(),
+                  &compressed_bytes)) {
+      OnUploadError("Compressing file failed.");
+      return;
+    }
+    compressed_contents =
+        std::string(compressed_buffer.get(), compressed_bytes);
+  } else {
+    if (file_contents.size() >= kMaxUploadBytes) {
+      OnUploadError("File is too large to upload.");
+      return;
+    }
+    compressed_contents = file_contents;
   }
 
   std::string post_data;
   SetupMultipart(product, version, metadata.Pass(), "trace.json.gz",
-                 std::string(compressed_contents.get(), compressed_bytes),
-                 &post_data);
+                 compressed_contents, &post_data);
 
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(&TraceCrashServiceUploader::CreateAndStartURLFetcher,
                  base::Unretained(this), upload_url, post_data));
 }
 
 void TraceCrashServiceUploader::OnUploadError(std::string error_message) {
   LOG(ERROR) << error_message;
   content::BrowserThread::PostTask(
@@ skipping 94 matching lines @@
   std::string content_type = kUploadContentType;
   content_type.append("; boundary=");
   content_type.append(kMultipartBoundary);
 
   url_fetcher_ =
       net::URLFetcher::Create(GURL(upload_url), net::URLFetcher::POST, this);
   url_fetcher_->SetRequestContext(request_context_);
   url_fetcher_->SetUploadData(content_type, post_data);
   url_fetcher_->Start();
 }