chromeos: Refactor D-Bus client creation for ash and browser processes

chromeos/dbus/dbus_client_bundle_unittest.cc

 // Copyright 2014 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 "chromeos/dbus/dbus_client_bundle.h"
-
 #include "chromeos/dbus/dbus_client_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
 namespace {
 
 // Makes mask operations more readable.
 DBusClientTypeMask AsClientTypeMask(DBusClientType type) {
   return static_cast<DBusClientTypeMask>(type);
 }
 
 }  // namespace
 
-// Tests that real and fake clients can be created.
-TEST(DBusClientBundleTest, CreateClientBundle) {
-  const DBusClientTypeMask real_clients =
-      AsClientTypeMask(DBusClientType::CRAS) |
-      AsClientTypeMask(DBusClientType::CROS_DISKS);
-  DBusClientBundle bundle(real_clients);
-
-  // Real clients are real.
-  EXPECT_TRUE(bundle.cras_audio_client());
-  EXPECT_TRUE(bundle.cros_disks_client());
-  EXPECT_TRUE(bundle.IsUsingReal(DBusClientType::CRAS));
-  EXPECT_TRUE(bundle.IsUsingReal(DBusClientType::CROS_DISKS));
-
-  // Fake clients are fake.
-  EXPECT_TRUE(bundle.permission_broker_client());
-  EXPECT_TRUE(bundle.power_manager_client());
-  EXPECT_FALSE(bundle.IsUsingReal(DBusClientType::PERMISSION_BROKER));
-  EXPECT_FALSE(bundle.IsUsingReal(DBusClientType::POWER_MANAGER));
-}
-
 TEST(DBusClientBundleTest, RealClientsFlagParser) {
   EXPECT_EQ(AsClientTypeMask(DBusClientType::NONE),
             ParseDBusRealClientsList("foo"));
 
   EXPECT_EQ(AsClientTypeMask(DBusClientType::BLUETOOTH),
             ParseDBusRealClientsList("BLUETOOTH"));
 
   EXPECT_EQ(AsClientTypeMask(DBusClientType::BLUETOOTH),
             ParseDBusRealClientsList("bluetooth"));
 
   EXPECT_EQ(AsClientTypeMask(DBusClientType::CRAS) |
                 AsClientTypeMask(DBusClientType::CROS_DISKS) |
                 AsClientTypeMask(DBusClientType::DEBUG_DAEMON) |
                 AsClientTypeMask(DBusClientType::SHILL),
             ParseDBusRealClientsList("Cras,Cros_Disks,debug_daemon,Shill"));
 
   EXPECT_EQ(AsClientTypeMask(DBusClientType::CRAS) |
                 AsClientTypeMask(DBusClientType::CROS_DISKS) |
                 AsClientTypeMask(DBusClientType::DEBUG_DAEMON) |
                 AsClientTypeMask(DBusClientType::SHILL),
             ParseDBusRealClientsList("foo,Cras,Cros_Disks,debug_daemon,Shill"));
 }
 
 }  // namespace chromeos