Retry icon fetching after intent_helper is ready

components/arc/intent_helper/activity_icon_loader_unittest.cc

 // Copyright 2016 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 "components/arc/intent_helper/activity_icon_loader.h"
 
 #include <memory>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 71 matching lines @@
                                    gfx::Image());
   loader->AddIconToCacheForTesting(ActivityIconLoader::ActivityName("p1", "a0"),
                                    gfx::Image());
 
   // Check that GetActivityIcons() immediately calls OnIconsReady0() with all
   // locally cached icons.
   std::vector<ActivityIconLoader::ActivityName> activities;
   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,
+            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.
 TEST(ActivityIconLoaderTest, TestOnIconsResized) {
   scoped_refptr<ActivityIconLoader> loader(new ActivityIconLoader);
   std::unique_ptr<ActivityIconLoader::ActivityToIconsMap> activity_to_icons(
       new ActivityIconLoader::ActivityToIconsMap);
   activity_to_icons->insert(
       std::make_pair(ActivityIconLoader::ActivityName("p0", "a0"),
                      ActivityIconLoader::Icons(gfx::Image(), gfx::Image())));
@@ skipping 37 matching lines @@
                     ActivityIconLoader::ActivityName("p0", "a0")));
   EXPECT_EQ(1U, loader->cached_icons_for_testing().count(
                     ActivityIconLoader::ActivityName("p1", "a1")));
   EXPECT_EQ(1U, loader->cached_icons_for_testing().count(
                     ActivityIconLoader::ActivityName("p1", "a0")));
   EXPECT_EQ(1U, loader->cached_icons_for_testing().count(
                     ActivityIconLoader::ActivityName("p2", "a2")));
 }
 
 }  // namespace arc