nfc: Various fixes to the NFC D-Bus client in chromeos/dbus.

chromeos/dbus/dbus_thread_manager.cc

Index: chromeos/dbus/dbus_thread_manager.cc
diff --git a/chromeos/dbus/dbus_thread_manager.cc b/chromeos/dbus/dbus_thread_manager.cc
index 7a8a417308bca4e94017fb88e9835190e59e9bf5..303f1098b3ab6df7deb7854b5df28c44cbee7eb6 100644
--- a/chromeos/dbus/dbus_thread_manager.cc
+++ b/chromeos/dbus/dbus_thread_manager.cc
@@ -420,11 +420,6 @@ void DBusThreadManager::InitializeClients() {
   InitClient(g_dbus_thread_manager->GetImageBurnerClient());
   InitClient(g_dbus_thread_manager->GetIntrospectableClient());
   InitClient(g_dbus_thread_manager->GetModemMessagingClient());
-  // Initialize the NFC clients in the correct order.
-  InitClient(g_dbus_thread_manager->GetNfcAdapterClient());
-  InitClient(g_dbus_thread_manager->GetNfcManagerClient());
-  InitClient(g_dbus_thread_manager->GetNfcDeviceClient());
-  InitClient(g_dbus_thread_manager->GetNfcTagClient());
   InitClient(g_dbus_thread_manager->GetPermissionBrokerClient());
   InitClient(g_dbus_thread_manager->GetPowerManagerClient());
   InitClient(g_dbus_thread_manager->GetSessionManagerClient());
@@ -437,6 +432,15 @@ void DBusThreadManager::InitializeClients() {
   InitClient(g_dbus_thread_manager->GetSystemClockClient());
   InitClient(g_dbus_thread_manager->GetUpdateEngineClient());
 
+  // Initialize the NFC clients in the correct order. The order of
+  // initialization matters due to dependencies that exist between the
+  // client objects.
+  InitClient(g_dbus_thread_manager->GetNfcManagerClient());
+  InitClient(g_dbus_thread_manager->GetNfcAdapterClient());
+  InitClient(g_dbus_thread_manager->GetNfcDeviceClient());
+  InitClient(g_dbus_thread_manager->GetNfcTagClient());
+  InitClient(g_dbus_thread_manager->GetNfcRecordClient());
+
   // PowerPolicyController is dependent on PowerManagerClient, so
   // initialize it after the main list of clients.
   if (g_dbus_thread_manager->GetPowerPolicyController()) {