Refactoring the SysInfoProvider.

chrome/browser/chromeos/system_logs/debugd_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/debugd_log_source.h"
+
+#include "base/bind.h"
+#include "base/bind_helpers.h"
+#include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
+#include "base/string_util.h"
+#include "chrome/browser/chromeos/system_logs/system_logs_fetcher.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"
+
+namespace {
+
+const char kNotAvailable[] = "<not available>";
+
+}  // namespace
+
+namespace chromeos {
+
+// Fetches logs from the debug daemon over DBus. When all the logs have been
+// fetched, forwards the results to the supplied Request. Used like:
+//   DebugDaemonLogSource* fetcher = new DebugDaemonLogSource(request);
+//   fetcher->Fetch();
+// Note that you do not need to delete the fetcher; it will delete itself after
+// Fetch() has forwarded the result to the request handler.
+
+
+DebugDaemonLogSource::DebugDaemonLogSource()
+    : response_(new SystemLogsResponse()),

[satorux1, 2012/08/13 18:29:03]

where will it be deleted?

[tudalex(Chromium), 2012/08/14 03:24:00]

Made it a scoped_ptr so it is going to be deleted when this object is deleted
which is after all the log sources have responded.

+      ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {}
+
+DebugDaemonLogSource::~DebugDaemonLogSource() {}
+
+void DebugDaemonLogSource::Fetch(const SysLogsFetcherCallback& request) {
+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+
+  request_ = request;
+  DebugDaemonClient* client = DBusThreadManager::Get()->GetDebugDaemonClient();
+  pending_requests_ = 4;

[satorux1, 2012/08/13 18:29:03]

4 looks cryptic. please define a constant with some comment.

[rkc, 2012/08/13 18:50:14]

Actually, this should get initialized to 0, then incremented after each
client->GetRoutes

That way if we add more client->GetXXX calls, it'll be clear that this needs to
be incremented.

[tudalex(Chromium), 2012/08/14 03:24:00]

Done.

+
+  client->GetRoutes(true,   // Numeric
+                    false,  // No IPv6
+                    base::Bind(&DebugDaemonLogSource::GotRoutes,
+                               weak_ptr_factory_.GetWeakPtr()));
+  client->GetNetworkStatus(base::Bind(&DebugDaemonLogSource::GotNetworkStatus,
+                                      weak_ptr_factory_.GetWeakPtr()));
+  client->GetModemStatus(base::Bind(&DebugDaemonLogSource::GotModemStatus,
+                                    weak_ptr_factory_.GetWeakPtr()));
+  client->GetAllLogs(base::Bind(&DebugDaemonLogSource::GotLogs,
+                                weak_ptr_factory_.GetWeakPtr()));
+}
+
+void DebugDaemonLogSource::GotRoutes(bool succeeded,

[satorux1, 2012/08/13 18:29:03]

OnGetRoutes() would be better. this way, it's easier to find the matching
callback for GetRoutes()

[tudalex(Chromium), 2012/08/14 03:24:00]

Done.

+                                      const std::vector<std::string>& routes) {
+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+
+  if (succeeded)
+    (*response_)["routes"] = JoinString(routes, '\n');
+  else
+    (*response_)["routes"] = kNotAvailable;
+  RequestCompleted();
+}
+
+void DebugDaemonLogSource::GotNetworkStatus(bool succeeded,
+                                             const std::string& status) {
+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+
+  if (succeeded)
+    (*response_)["network-status"] = status;
+  else
+    (*response_)["network-status"] = kNotAvailable;
+  RequestCompleted();
+}
+
+void DebugDaemonLogSource::GotModemStatus(bool succeeded,
+                                           const std::string& status) {
+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+
+  if (succeeded)
+    (*response_)["modem-status"] = status;
+  else
+    (*response_)["modem-status"] = kNotAvailable;
+  RequestCompleted();
+}
+
+void DebugDaemonLogSource::GotLogs(bool /* succeeded */,
+                                    const std::map<std::string,

[satorux1, 2012/08/13 18:29:03]

indentation

[tudalex(Chromium), 2012/08/14 03:24:00]

Done.

+                                                   std::string>& logs) {
+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+
+  // We ignore 'succeeded' for this callback - we want to display as much of the
+  // debug info as we can even if we failed partway through parsing, and if we
+  // couldn't fetch any of it, none of the fields will even appear.
+  for (std::map<std::string, std::string>::const_iterator it = logs.begin();
+       it != logs.end(); ++it)
+    (*response_)[it->first] = it->second;
+  RequestCompleted();
+}
+
+void DebugDaemonLogSource::RequestCompleted() {
+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  if (--pending_requests_)
+    return;
+  request_.Run(response_);
+}
+
+}  // namespace chromeos