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 414 matching lines @@
   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->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->GetNfcManagerClient());
   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());
   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());
@@ skipping 12 matching lines @@
     g_dbus_thread_manager->GetSystemBus()->GetManagedObjects();
 }
 
 // static
 void DBusThreadManager::InitClient(DBusClient* client) {
   if (client)
     client->Init(g_dbus_thread_manager->GetSystemBus());
 }
 
 }  // namespace chromeos