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

chromeos/dbus/dbus_thread_manager.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 "chromeos/dbus/dbus_thread_manager.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/observer_list.h"
@@ skipping 402 matching lines @@
   InitClient(g_dbus_thread_manager->GetBluetoothInputClient());
   InitClient(g_dbus_thread_manager->GetBluetoothProfileManagerClient());
   InitClient(g_dbus_thread_manager->GetCrasAudioClient());
   InitClient(g_dbus_thread_manager->GetCrosDisksClient());
   InitClient(g_dbus_thread_manager->GetCryptohomeClient());
   InitClient(g_dbus_thread_manager->GetDebugDaemonClient());
   InitClient(g_dbus_thread_manager->GetGsmSMSClient());
   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());
   InitClient(g_dbus_thread_manager->GetShillDeviceClient());
   InitClient(g_dbus_thread_manager->GetShillIPConfigClient());
   InitClient(g_dbus_thread_manager->GetShillManagerClient());
   InitClient(g_dbus_thread_manager->GetShillServiceClient());
   InitClient(g_dbus_thread_manager->GetShillProfileClient());
   InitClient(g_dbus_thread_manager->GetSMSClient());
   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()) {
     g_dbus_thread_manager->GetPowerPolicyController()->Init(
         g_dbus_thread_manager);
   }
 
   // This must be called after the list of clients so they've each had a
   // chance to register with their object g_dbus_thread_managers.
   if (g_dbus_thread_manager->GetSystemBus())
     g_dbus_thread_manager->GetSystemBus()->GetManagedObjects();
 }
 
 // static
 void DBusThreadManager::InitClient(DBusClient* client) {
   if (client)
     client->Init(g_dbus_thread_manager->GetSystemBus());
 }
 
 }  // namespace chromeos