Use scrubbed logs for sending with feedback reports.

chrome/browser/chromeos/system_logs/debug_daemon_log_source.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.
 
 #include "chrome/browser/chromeos/system_logs/debug_daemon_log_source.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
-#include "chrome/browser/chromeos/system_logs/system_logs_fetcher.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/debug_daemon_client.h"
 #include "content/public/browser/browser_thread.h"
 
 const char kNotAvailable[] = "<not available>";
 const char kRoutesKeyName[] = "routes";
 const char kNetworkStatusKeyName[] = "network-status";
 const char kModemStatusKeyName[] = "modem-status";
 const char kWiMaxStatusKeyName[] = "wimax-status";
 const char kUserLogFileKeyName[] = "user_log_files";
 
 namespace chromeos {
 
-DebugDaemonLogSource::DebugDaemonLogSource()
+DebugDaemonLogSource::DebugDaemonLogSource(bool scrub)
     : response_(new SystemLogsResponse()),
       num_pending_requests_(0),
+      scrub_(scrub),
       weak_ptr_factory_(this) {}
 
 DebugDaemonLogSource::~DebugDaemonLogSource() {}
 
 void DebugDaemonLogSource::Fetch(const SysLogsSourceCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   DCHECK(!callback.is_null());
   DCHECK(callback_.is_null());
 
   callback_ = callback;
   DebugDaemonClient* client = DBusThreadManager::Get()->GetDebugDaemonClient();
 
   client->GetRoutes(true,   // Numeric
                     false,  // No IPv6
                     base::Bind(&DebugDaemonLogSource::OnGetRoutes,
                                weak_ptr_factory_.GetWeakPtr()));
   ++num_pending_requests_;
   client->GetNetworkStatus(base::Bind(&DebugDaemonLogSource::OnGetNetworkStatus,
                                       weak_ptr_factory_.GetWeakPtr()));
   ++num_pending_requests_;
   client->GetModemStatus(base::Bind(&DebugDaemonLogSource::OnGetModemStatus,
                                     weak_ptr_factory_.GetWeakPtr()));
   ++num_pending_requests_;
   client->GetWiMaxStatus(base::Bind(&DebugDaemonLogSource::OnGetWiMaxStatus,
                                     weak_ptr_factory_.GetWeakPtr()));
   ++num_pending_requests_;
-  client->GetAllLogs(base::Bind(&DebugDaemonLogSource::OnGetLogs,
-                                weak_ptr_factory_.GetWeakPtr()));
-  ++num_pending_requests_;
   client->GetUserLogFiles(base::Bind(&DebugDaemonLogSource::OnGetUserLogFiles,
                                      weak_ptr_factory_.GetWeakPtr()));
   ++num_pending_requests_;
+
+  if (scrub_) {
+    client->GetScrubbedLogs(base::Bind(&DebugDaemonLogSource::OnGetLogs,
+                                       weak_ptr_factory_.GetWeakPtr()));
+  } else {
+    client->GetAllLogs(base::Bind(&DebugDaemonLogSource::OnGetLogs,
+                                  weak_ptr_factory_.GetWeakPtr()));
+  }
+  ++num_pending_requests_;
 }
 
 void DebugDaemonLogSource::OnGetRoutes(bool succeeded,
                                        const std::vector<std::string>& routes) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   if (succeeded)
     (*response_)[kRoutesKeyName] = JoinString(routes, '\n');
   else
     (*response_)[kRoutesKeyName] = kNotAvailable;
@@ skipping 90 matching lines @@
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   DCHECK(!callback_.is_null());
 
   --num_pending_requests_;
   if (num_pending_requests_ > 0)
     return;
   callback_.Run(response_.get());
 }
 
 }  // namespace chromeos