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

ash/common/system/chromeos/power/power_status.cc

 // Copyright (c) 2013 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 "ash/common/system/chromeos/power/power_status.h"
 
 #include <algorithm>
 #include <cmath>
 
+#include "ash/common/dbus_thread_manager_ash.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
+// #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/time_format.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect.h"
@@ skipping 193 matching lines @@
   DCHECK(observer);
   observers_.AddObserver(observer);
 }
 
 void PowerStatus::RemoveObserver(Observer* observer) {
   DCHECK(observer);
   observers_.RemoveObserver(observer);
 }
 
 void PowerStatus::RequestStatusUpdate() {
-  chromeos::DBusThreadManager::Get()
+  DBusThreadManagerAsh::Get()
       ->GetPowerManagerClient()
       ->RequestStatusUpdate();
 }
 
 void PowerStatus::SetPowerSource(const std::string& id) {
-  chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->SetPowerSource(
+  DBusThreadManagerAsh::Get()->GetPowerManagerClient()->SetPowerSource(
       id);
 }
 
 bool PowerStatus::IsBatteryPresent() const {
   return proto_.battery_state() !=
          power_manager::PowerSupplyProperties_BatteryState_NOT_PRESENT;
 }
 
 bool PowerStatus::IsBatteryFull() const {
   return proto_.battery_state() ==
@@ skipping 236 matching lines @@
             : IDS_ASH_STATUS_TRAY_BATTERY_TIME_LEFT_ACCESSIBLE,
         GetBatteryTimeAccessibilityString(hour, min));
   }
   return battery_time_accessible.empty()
              ? battery_percentage_accessible
              : battery_percentage_accessible + base::ASCIIToUTF16(". ") +
                    battery_time_accessible;
 }
 
 PowerStatus::PowerStatus() {
-  chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(
+  DBusThreadManagerAsh::Get()->GetPowerManagerClient()->AddObserver(
       this);
-  chromeos::DBusThreadManager::Get()
+  DBusThreadManagerAsh::Get()
       ->GetPowerManagerClient()
       ->RequestStatusUpdate();
 }
 
 PowerStatus::~PowerStatus() {
-  chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(
+  DBusThreadManagerAsh::Get()->GetPowerManagerClient()->RemoveObserver(
       this);
 }
 
 void PowerStatus::SetProtoForTesting(
     const power_manager::PowerSupplyProperties& proto) {
   proto_ = proto;
   SanitizeProto(&proto_);
 }
 
 void PowerStatus::PowerChanged(
     const power_manager::PowerSupplyProperties& proto) {
   proto_ = proto;
   SanitizeProto(&proto_);
   FOR_EACH_OBSERVER(Observer, observers_, OnPowerStatusChanged());
 }
 
 }  // namespace ash