| Index: chrome/browser/ui/webui/settings/settings_manage_profile_handler_unittest.cc
|
| diff --git a/chrome/browser/ui/webui/settings/settings_manage_profile_handler_unittest.cc b/chrome/browser/ui/webui/settings/settings_manage_profile_handler_unittest.cc
|
| index 6c8a5056e0241d483e1778b3935540cb78ed211f..01362e6f25f46a099253852ce128780ed1c162fb 100644
|
| --- a/chrome/browser/ui/webui/settings/settings_manage_profile_handler_unittest.cc
|
| +++ b/chrome/browser/ui/webui/settings/settings_manage_profile_handler_unittest.cc
|
| @@ -46,15 +46,21 @@ class ManageProfileHandlerTest : public testing::Test {
|
| }
|
|
|
| void VerifyIconList(const base::Value* value) {
|
| - const base::ListValue* icon_urls = nullptr;
|
| - ASSERT_TRUE(value->GetAsList(&icon_urls));
|
| -
|
| - // Expect the list of icon URLs to be a non-empty list of non-empty strings.
|
| - EXPECT_FALSE(icon_urls->empty());
|
| - for (size_t i = 0; i < icon_urls->GetSize(); ++i) {
|
| + const base::ListValue* icons = nullptr;
|
| + ASSERT_TRUE(value->GetAsList(&icons));
|
| +
|
| + // Expect a non-empty list of dictionaries containing non-empty strings for
|
| + // profile avatar icon urls and labels.
|
| + EXPECT_FALSE(icons->empty());
|
| + for (size_t i = 0; i < icons->GetSize(); ++i) {
|
| + const base::DictionaryValue* icon = nullptr;
|
| + EXPECT_TRUE(icons->GetDictionary(i, &icon));
|
| std::string icon_url;
|
| - EXPECT_TRUE(icon_urls->GetString(i, &icon_url));
|
| + EXPECT_TRUE(icon->GetString("url", &icon_url));
|
| EXPECT_FALSE(icon_url.empty());
|
| + std::string icon_label;
|
| + EXPECT_TRUE(icon->GetString("label", &icon_label));
|
| + EXPECT_FALSE(icon_label.empty());
|
| }
|
| }
|
|
|
|
|