Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(47)

Side by Side Diff: chrome/browser/feedback/system_logs/scrubbed_system_logs_fetcher.cc

Issue 2242833003: Add the most recent crash report IDs to feedback reports (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: RFR Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/browser/feedback/system_logs/scrubbed_system_logs_fetcher.h" 5 #include "chrome/browser/feedback/system_logs/scrubbed_system_logs_fetcher.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_so urce.h" 10 #include "chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_so urce.h"
11 #include "chrome/browser/feedback/system_logs/log_sources/crash_ids_source.h"
11 #include "chrome/browser/feedback/system_logs/log_sources/memory_details_log_sou rce.h" 12 #include "chrome/browser/feedback/system_logs/log_sources/memory_details_log_sou rce.h"
12 #include "content/public/browser/browser_thread.h" 13 #include "content/public/browser/browser_thread.h"
13 14
14 #if defined(OS_CHROMEOS) 15 #if defined(OS_CHROMEOS)
15 #include "chrome/browser/chromeos/system_logs/command_line_log_source.h" 16 #include "chrome/browser/chromeos/system_logs/command_line_log_source.h"
16 #include "chrome/browser/chromeos/system_logs/dbus_log_source.h" 17 #include "chrome/browser/chromeos/system_logs/dbus_log_source.h"
17 #include "chrome/browser/chromeos/system_logs/debug_daemon_log_source.h" 18 #include "chrome/browser/chromeos/system_logs/debug_daemon_log_source.h"
18 #include "chrome/browser/chromeos/system_logs/device_event_log_source.h" 19 #include "chrome/browser/chromeos/system_logs/device_event_log_source.h"
19 #include "chrome/browser/chromeos/system_logs/lsb_release_log_source.h" 20 #include "chrome/browser/chromeos/system_logs/lsb_release_log_source.h"
20 #include "chrome/browser/chromeos/system_logs/touch_log_source.h" 21 #include "chrome/browser/chromeos/system_logs/touch_log_source.h"
21 #endif 22 #endif
22 23
23 using content::BrowserThread; 24 using content::BrowserThread;
24 25
25 namespace system_logs { 26 namespace system_logs {
26 27
27 ScrubbedSystemLogsFetcher::ScrubbedSystemLogsFetcher() { 28 ScrubbedSystemLogsFetcher::ScrubbedSystemLogsFetcher() {
28 data_sources_.push_back(new ChromeInternalLogSource()); 29 data_sources_.push_back(new ChromeInternalLogSource());
30 data_sources_.push_back(new CrashIdsSource());
29 data_sources_.push_back(new MemoryDetailsLogSource()); 31 data_sources_.push_back(new MemoryDetailsLogSource());
30 32
31 #if defined(OS_CHROMEOS) 33 #if defined(OS_CHROMEOS)
32 data_sources_.push_back(new CommandLineLogSource()); 34 data_sources_.push_back(new CommandLineLogSource());
33 data_sources_.push_back(new DBusLogSource()); 35 data_sources_.push_back(new DBusLogSource());
34 data_sources_.push_back(new DeviceEventLogSource()); 36 data_sources_.push_back(new DeviceEventLogSource());
35 data_sources_.push_back(new LsbReleaseLogSource()); 37 data_sources_.push_back(new LsbReleaseLogSource());
36 data_sources_.push_back(new TouchLogSource()); 38 data_sources_.push_back(new TouchLogSource());
37 39
38 // Debug Daemon data source - currently only this data source supports 40 // Debug Daemon data source - currently only this data source supports
39 // the scrub_data parameter but all others get processed by Rewrite() 41 // the scrub_data parameter but all others get processed by Rewrite()
40 // as well. 42 // as well.
41 const bool scrub_data = true; 43 const bool scrub_data = true;
42 data_sources_.push_back(new DebugDaemonLogSource(scrub_data)); 44 data_sources_.push_back(new DebugDaemonLogSource(scrub_data));
43 #endif 45 #endif
44 46
45 num_pending_requests_ = data_sources_.size(); 47 num_pending_requests_ = data_sources_.size();
46 } 48 }
47 49
48 ScrubbedSystemLogsFetcher::~ScrubbedSystemLogsFetcher() { 50 ScrubbedSystemLogsFetcher::~ScrubbedSystemLogsFetcher() {
49 } 51 }
50 52
51 void ScrubbedSystemLogsFetcher::Rewrite(const std::string& source_name, 53 void ScrubbedSystemLogsFetcher::Rewrite(const std::string& source_name,
52 SystemLogsResponse* response) { 54 SystemLogsResponse* response) {
53 for (auto& element : *response) 55 for (auto& element : *response)
54 element.second = anonymizer_.Anonymize(element.second); 56 element.second = anonymizer_.Anonymize(element.second);
55 } 57 }
56 58
57 } // namespace system_logs 59 } // namespace system_logs
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698