mash: Allow a subset of D-Bus clients to be created in DBusThreadManager

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 <stddef.h>
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
+#include "chrome/browser/chromeos/dbus_thread_manager_chrome.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/common/chrome_switches.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
+// #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/debug_daemon_client.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.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";
@@ skipping 10 matching lines @@
 
 DebugDaemonLogSource::~DebugDaemonLogSource() {}
 
 void DebugDaemonLogSource::Fetch(const SysLogsSourceCallback& callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(!callback.is_null());
   DCHECK(callback_.is_null());
 
   callback_ = callback;
   chromeos::DebugDaemonClient* client =
-      chromeos::DBusThreadManager::Get()->GetDebugDaemonClient();
+      DBusThreadManagerChrome::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,
@@ skipping 136 matching lines @@
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(!callback_.is_null());
 
   --num_pending_requests_;
   if (num_pending_requests_ > 0)
     return;
   callback_.Run(response_.get());
 }
 
 }  // namespace system_logs