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 66a12aff7a786dcc65ecde1d1c1c75653f5eda45..30648d6b021e14407b61d1deff68af3cb2f95d62 100644
--- a/chromeos/dbus/dbus_thread_manager.cc
+++ b/chromeos/dbus/dbus_thread_manager.cc
@@ -432,10 +432,11 @@ void DBusThreadManager::InitializeClients() {
   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());

[keybuk, 2013/12/03 18:13:26]

These should be in alphabetical order.

If there's a dependency reason for them being out of order, you should explain
it in the comment above (e.g. "adapter client uses manager client during
initialization") so that somebody doesn't accidentally fix this in future

[armansito, 2013/12/03 18:34:19]

There is a dependency reason and the comment line above that says "Initialize
NFC clients in the correct order" exists to clarify that, though somebody DID
accidentally fix this despite the comment and you didn't spot it either, so I
suppose this is not clear enough. So I moved the NFC client initialization after
the standard list of inits, with spaces around it.

+  InitClient(g_dbus_thread_manager->GetNfcAdapterClient());
   InitClient(g_dbus_thread_manager->GetNfcDeviceClient());
   InitClient(g_dbus_thread_manager->GetNfcTagClient());
+  InitClient(g_dbus_thread_manager->GetNfcRecordClient());
   InitClient(g_dbus_thread_manager->GetPermissionBrokerClient());
   InitClient(g_dbus_thread_manager->GetPowerManagerClient());
   InitClient(g_dbus_thread_manager->GetSessionManagerClient());