Update app info and install prompt UI to show retained devices.

apps/saved_devices_service_unittest.cc

 // Copyright 2014 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 "apps/saved_devices_service.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/values_test_util.h"
 #include "chrome/browser/extensions/test_extension_environment.h"
 #include "chrome/test/base/testing_profile.h"
@@ skipping 150 matching lines @@
   // This is necessary as writing out registered devices happens in a task on
   // the UI thread.
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
 
   ASSERT_TRUE(saved_devices->IsRegistered(device0));
   ASSERT_TRUE(saved_devices->IsRegistered(device1));
   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();
 
   ASSERT_TRUE(saved_devices->IsRegistered(device0));
   ASSERT_FALSE(saved_devices->IsRegistered(device1));
   ASSERT_FALSE(saved_devices->IsRegistered(device2));
   ASSERT_FALSE(saved_devices->IsRegistered(device3));
 
   service_->Clear(extension_->id());
 
   // 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) {
   scoped_ptr<base::Value> prefs_value = base::test::ParseJson(
       "["
       "  {"
       "    \"product_id\": 0,"
       "    \"serial_number\": \"ABCDE\","
       "    \"type\": \"usb\","
       "    \"vendor_id\": 0"
       "  }"
       "]");
   env_.GetExtensionPrefs()->UpdateExtensionPref(
       extension_->id(), "devices", prefs_value.release());
 
   SavedDevicesService::SavedDevices* saved_devices =
       service_->GetOrInsert(extension_->id());
   ASSERT_TRUE(saved_devices->IsRegistered(device0));
   ASSERT_FALSE(saved_devices->IsRegistered(device1));
   ASSERT_FALSE(saved_devices->IsRegistered(device2));
   ASSERT_FALSE(saved_devices->IsRegistered(device3));
 }
 
 }  // namespace apps