Eliminate mojo:resource_provider

ash/mus/sysui_application.cc

Index: ash/mus/sysui_application.cc
diff --git a/ash/mus/sysui_application.cc b/ash/mus/sysui_application.cc
index 985cf0b5b509fe68caa57cf2fac4fb452c4b2297..0be693128e087514dbf83359315ad37643de784f 100644
--- a/ash/mus/sysui_application.cc
+++ b/ash/mus/sysui_application.cc
@@ -25,9 +25,9 @@
 #include "base/path_service.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "components/mus/public/cpp/property_type_converters.h"
-#include "components/resource_provider/public/cpp/resource_loader.h"
 #include "mash/wm/public/interfaces/ash_window_type.mojom.h"
 #include "mash/wm/public/interfaces/container.mojom.h"
+#include "services/catalog/public/cpp/resource_loader.h"
 #include "ui/aura/env.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
@@ -242,19 +242,17 @@ class AshInit {
     resource_paths.insert(kResourceFile100);
     resource_paths.insert(kResourceFile200);
 
-    resource_provider::ResourceLoader loader(connector, resource_paths);
-    if (!loader.BlockUntilLoaded())
-      return;
+    catalog::ResourceLoader loader(connector, resource_paths);
 
     // Load ash resources and en-US strings; not 'common' (Chrome) resources.
     // TODO(msw): Check ResourceBundle::IsScaleFactorSupported; load 300% etc.
     ui::ResourceBundle::InitSharedInstanceWithPakFileRegion(
-        loader.ReleaseFile(kResourceFileStrings),
+        loader.TakeFile(kResourceFileStrings),
         base::MemoryMappedFile::Region::kWholeFile);
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-    rb.AddDataPackFromFile(loader.ReleaseFile(kResourceFile100),
+    rb.AddDataPackFromFile(loader.TakeFile(kResourceFile100),
                            ui::SCALE_FACTOR_100P);
-    rb.AddDataPackFromFile(loader.ReleaseFile(kResourceFile200),
+    rb.AddDataPackFromFile(loader.TakeFile(kResourceFile200),
                            ui::SCALE_FACTOR_200P);
   }