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

chromeos/dbus/nfc_client_unittest.cc

 // Copyright 2013 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 "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "chromeos/dbus/nfc_adapter_client.h"
 #include "chromeos/dbus/nfc_client_helpers.h"
 #include "chromeos/dbus/nfc_device_client.h"
 #include "chromeos/dbus/nfc_manager_client.h"
@@ skipping 54 matching lines @@
   MOCK_METHOD2(DevicePropertyChanged, void(const dbus::ObjectPath&,
                                            const std::string&));
 };
 
 class MockNfcRecordObserver : public NfcRecordClient::Observer {
  public:
   MOCK_METHOD1(RecordAdded, void(const dbus::ObjectPath&));
   MOCK_METHOD1(RecordRemoved, void(const dbus::ObjectPath&));
   MOCK_METHOD2(RecordPropertyChanged, void(const dbus::ObjectPath&,
                                            const std::string&));
+  MOCK_METHOD1(RecordPropertiesReceived, void(const dbus::ObjectPath&));
 };
 
 class MockNfcTagObserver : public NfcTagClient::Observer {
  public:
   MOCK_METHOD1(TagAdded, void(const dbus::ObjectPath&));
   MOCK_METHOD1(TagRemoved, void(const dbus::ObjectPath&));
   MOCK_METHOD2(TagPropertyChanged, void(const dbus::ObjectPath&,
                                         const std::string&));
 };
 
@@ skipping 423 matching lines @@
       base::Bind(&NfcClientTest::ErrorCallback, base::Unretained(this)));
 }
 
 // Tests that when tags are added and removed through an adapter, all
 // observers are notified and the proxies are created and removed
 // accordingly.
 TEST_F(NfcClientTest, TagsAddedAndRemoved) {
   // Invoking methods on tags that haven't been added should fail.
   EXPECT_CALL(*this,
               ErrorCallback(nfc_client_helpers::kUnknownObjectError, _));
-  NfcRecordClient::Attributes write_data;
-  write_data[nfc_record::kTypeProperty] = nfc_record::kTypeText;
+  base::DictionaryValue write_data;
+  write_data.SetString(nfc_record::kTypeProperty, nfc_record::kTypeText);
   tag_client_->Write(dbus::ObjectPath(kTestTagPath0), write_data,
                      base::Bind(&NfcClientTest::SuccessCallback,
                                 base::Unretained(this)),
                      base::Bind(&NfcClientTest::ErrorCallback,
                                 base::Unretained(this)));
   Mock::VerifyAndClearExpectations(this);
 
   // Add adapter 0.
   ObjectPathVector adapter_paths;
   adapter_paths.push_back(dbus::ObjectPath(kTestAdapterPath0));
@@ skipping 107 matching lines @@
                                 base::Unretained(this)));
 }
 
 // Tests that when devices are added and removed through an adapter, all
 // observers are notified and the proxies are created and removed
 // accordingly.
 TEST_F(NfcClientTest, DevicesAddedAndRemoved) {
   // Invoking methods on devices that haven't been added should fail.
   EXPECT_CALL(*this,
               ErrorCallback(nfc_client_helpers::kUnknownObjectError, _));
-  NfcRecordClient::Attributes write_data;
-  write_data[nfc_record::kTypeProperty] = nfc_record::kTypeText;
+  base::DictionaryValue write_data;
+  write_data.SetString(nfc_record::kTypeProperty, nfc_record::kTypeText);
   device_client_->Push(dbus::ObjectPath(kTestDevicePath0), write_data,
                        base::Bind(&NfcClientTest::SuccessCallback,
                                   base::Unretained(this)),
                        base::Bind(&NfcClientTest::ErrorCallback,
                                   base::Unretained(this)));
   Mock::VerifyAndClearExpectations(this);
 
   // Add adapter 0.
   ObjectPathVector adapter_paths;
   adapter_paths.push_back(dbus::ObjectPath(kTestAdapterPath0));
@@ skipping 221 matching lines @@
   EXPECT_CALL(mock_tag_observer_,
               TagRemoved(dbus::ObjectPath(kTestTagPath1)));
   EXPECT_CALL(mock_record_observer_,
               RecordRemoved(dbus::ObjectPath(kTestRecordPath2)));
   EXPECT_CALL(mock_record_observer_,
               RecordRemoved(dbus::ObjectPath(kTestRecordPath3)));
   SimulateAdaptersChanged(object_paths);
 }
 
 }  // namespace chromeos