OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include <string> | 5 #include <string> |
6 | 6 |
7 #include "base/json/json_reader.h" | 7 #include "base/json/json_reader.h" |
8 #include "base/metrics/field_trial.h" | 8 #include "base/metrics/field_trial.h" |
9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
10 #include "chrome/browser/tracing/crash_service_uploader.h" | 10 #include "chrome/browser/tracing/crash_service_uploader.h" |
(...skipping 20 matching lines...) Expand all Loading... |
31 void OnUploadComplete(TraceCrashServiceUploader* uploader, | 31 void OnUploadComplete(TraceCrashServiceUploader* uploader, |
32 base::Closure done_callback, | 32 base::Closure done_callback, |
33 bool success, | 33 bool success, |
34 const std::string& feedback) { | 34 const std::string& feedback) { |
35 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 35 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
36 done_callback.Run(); | 36 done_callback.Run(); |
37 } | 37 } |
38 | 38 |
39 void UploadCallback(const std::string& upload_url, | 39 void UploadCallback(const std::string& upload_url, |
40 const scoped_refptr<base::RefCountedString>& file_contents, | 40 const scoped_refptr<base::RefCountedString>& file_contents, |
| 41 const std::map<std::string, std::string>& metadata, |
41 base::Closure callback) { | 42 base::Closure callback) { |
42 TraceCrashServiceUploader* uploader = new TraceCrashServiceUploader( | 43 TraceCrashServiceUploader* uploader = new TraceCrashServiceUploader( |
43 g_browser_process->system_request_context()); | 44 g_browser_process->system_request_context()); |
44 | 45 |
45 uploader->SetUploadURL(upload_url); | 46 uploader->SetUploadURL(upload_url); |
| 47 uploader->SetMetadata(metadata); |
46 uploader->DoUpload( | 48 uploader->DoUpload( |
47 file_contents->data(), base::Bind(&OnUploadProgress), | 49 file_contents->data(), base::Bind(&OnUploadProgress), |
48 base::Bind(&OnUploadComplete, base::Owned(uploader), callback)); | 50 base::Bind(&OnUploadComplete, base::Owned(uploader), callback)); |
49 } | 51 } |
50 | 52 |
51 } // namespace | 53 } // namespace |
52 | 54 |
53 void SetupBackgroundTracingFieldTrial() { | 55 void SetupBackgroundTracingFieldTrial() { |
54 std::string config_text = variations::GetVariationParamValue( | 56 std::string config_text = variations::GetVariationParamValue( |
55 kBackgroundTracingFieldTrial, kBackgroundTracingConfig); | 57 kBackgroundTracingFieldTrial, kBackgroundTracingConfig); |
(...skipping 18 matching lines...) Expand all Loading... |
74 content::BackgroundTracingConfig::FromDict(dict); | 76 content::BackgroundTracingConfig::FromDict(dict); |
75 if (!config) | 77 if (!config) |
76 return; | 78 return; |
77 | 79 |
78 content::BackgroundTracingManager::GetInstance()->SetActiveScenario( | 80 content::BackgroundTracingManager::GetInstance()->SetActiveScenario( |
79 config.Pass(), base::Bind(&UploadCallback, upload_url), | 81 config.Pass(), base::Bind(&UploadCallback, upload_url), |
80 content::BackgroundTracingManager::ANONYMIZE_DATA); | 82 content::BackgroundTracingManager::ANONYMIZE_DATA); |
81 } | 83 } |
82 | 84 |
83 } // namespace tracing | 85 } // namespace tracing |
OLD | NEW |