Index: apps/saved_devices_service_unittest.cc |
diff --git a/apps/saved_devices_service_unittest.cc b/apps/saved_devices_service_unittest.cc |
index b2ed54451b006c6c7b0157cfea15ed172af3a983..c9b386cfb96e737f27e0e2de84877236df1b4873 100644 |
--- a/apps/saved_devices_service_unittest.cc |
+++ b/apps/saved_devices_service_unittest.cc |
@@ -168,10 +168,11 @@ TEST_F(SavedDevicesServiceTest, RegisterDevices) { |
ASSERT_FALSE(saved_devices->IsRegistered(device2)); |
ASSERT_FALSE(saved_devices->IsRegistered(device3)); |
- std::vector<SavedDeviceEntry> device_entries = |
- service_->GetAllDevices(extension_->id()); |
- ASSERT_EQ(1U, device_entries.size()); |
- ASSERT_EQ(base::ASCIIToUTF16("ABCDE"), device_entries[0].serial_number); |
+ std::vector<base::string16> device_messages = |
+ service_->GetPermissionMessageStrings(extension_->id()); |
+ ASSERT_EQ(1U, device_messages.size()); |
+ ASSERT_NE(device_messages[0].find(base::ASCIIToUTF16("ABCDE")), |
+ base::string16::npos); |
device1->NotifyDisconnect(); |
@@ -185,8 +186,8 @@ TEST_F(SavedDevicesServiceTest, RegisterDevices) { |
// App is normally restarted, clearing its reference to the SavedDevices. |
saved_devices = service_->GetOrInsert(extension_->id()); |
ASSERT_FALSE(saved_devices->IsRegistered(device0)); |
- device_entries = service_->GetAllDevices(extension_->id()); |
- ASSERT_EQ(0U, device_entries.size()); |
+ device_messages = service_->GetPermissionMessageStrings(extension_->id()); |
+ ASSERT_EQ(0U, device_messages.size()); |
} |
TEST_F(SavedDevicesServiceTest, LoadPrefs) { |