Retry icon fetching after intent_helper is ready

components/arc/intent_helper/activity_icon_loader_unittest.cc

Index: components/arc/intent_helper/activity_icon_loader_unittest.cc
diff --git a/components/arc/intent_helper/activity_icon_loader_unittest.cc b/components/arc/intent_helper/activity_icon_loader_unittest.cc
index 4504e0d7270e112636fe849c3c1300d617eb98aa..e56d68dee92dc6692300f66e7024e3aac14a347f 100644
--- a/components/arc/intent_helper/activity_icon_loader_unittest.cc
+++ b/components/arc/intent_helper/activity_icon_loader_unittest.cc
@@ -89,17 +89,20 @@ TEST(ActivityIconLoaderTest, TestGetActivityIcons) {
   activities.emplace_back("p0", "a0");
   activities.emplace_back("p1", "a1");
   activities.emplace_back("p1", "a0");
-  EXPECT_TRUE(loader->GetActivityIcons(activities, base::Bind(&OnIconsReady0)));
+  EXPECT_EQ(ActivityIconLoader::GetResult::SUCCEEDED_SYNC,

[Luis Héctor Chávez, 2016/06/02 16:59:47]

Oh EXPECTED_EQ now works with case class? Neat!

+            loader->GetActivityIcons(activities, base::Bind(&OnIconsReady0)));
 
   // Test with different |activities|.
   activities.clear();
   activities.emplace_back("p1", "a1");
-  EXPECT_TRUE(loader->GetActivityIcons(activities, base::Bind(&OnIconsReady1)));
+  EXPECT_EQ(ActivityIconLoader::GetResult::SUCCEEDED_SYNC,
+            loader->GetActivityIcons(activities, base::Bind(&OnIconsReady1)));
   activities.clear();
+  EXPECT_EQ(ActivityIconLoader::GetResult::SUCCEEDED_SYNC,
+            loader->GetActivityIcons(activities, base::Bind(&OnIconsReady2)));
   activities.emplace_back("p1", "a_unknown");
-  EXPECT_TRUE(loader->GetActivityIcons(activities, base::Bind(&OnIconsReady2)));
-  activities.clear();
-  EXPECT_TRUE(loader->GetActivityIcons(activities, base::Bind(&OnIconsReady2)));
+  EXPECT_EQ(ActivityIconLoader::GetResult::FAILED_ARC_NOT_SUPPORTED,
+            loader->GetActivityIcons(activities, base::Bind(&OnIconsReady2)));
 }
 
 // Tests if OnIconsResized updates the cache.