Keep pending load-icon call when disconnected

Also add another nullptr check for the AppConnectionHolder, similar to
crrev.com/c/1750467

Change-Id: Id6c8fc6a02aa21908fa89e6d624cd94cf099712f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1752568Reviewed-by: Dominick Ng <dominickn@chromium.org>
Commit-Queue: Nigel Tao <nigeltao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#686729}

chrome/browser/apps/app_service/arc_apps.cc

@@ -395,10 +395,12 @@ void ArcApps::OnConnectionReady() {
     return;
   }
   AppConnectionHolder* app_connection_holder = prefs->app_connection_holder();
-  for (auto& pending : pending_load_icon_calls_) {
-    std::move(pending).Run(app_connection_holder);
+  if (app_connection_holder && app_connection_holder->IsConnected()) {
+    for (auto& pending : pending_load_icon_calls_) {
+      std::move(pending).Run(app_connection_holder);
+    }
+    pending_load_icon_calls_.clear();
   }
-  pending_load_icon_calls_.clear();
 }
 
 void ArcApps::OnAppRegistered(const std::string& app_id,
@@ -527,14 +529,12 @@ void ArcApps::LoadIconFromVM(const std::string app_id,
 
       AppConnectionHolder* app_connection_holder =
           prefs->app_connection_holder();
-      if (app_connection_holder) {
-        if (app_connection_holder->IsConnected()) {
-          std::move(pending).Run(app_connection_holder);
-        } else {
-          pending_load_icon_calls_.push_back(std::move(pending));
-        }
-        return;
+      if (app_connection_holder && app_connection_holder->IsConnected()) {
+        std::move(pending).Run(app_connection_holder);
+      } else {
+        pending_load_icon_calls_.push_back(std::move(pending));
       }
+      return;
     }
   }