Eliminate mojo:resource_provider

ui/views/mus/aura_init.cc

Index: ui/views/mus/aura_init.cc
diff --git a/ui/views/mus/aura_init.cc b/ui/views/mus/aura_init.cc
index c3217f84b2ac70c620f623bc59f47e093b1963f7..9e4a53fcaadf9a8453672b178f99c7f91686d752 100644
--- a/ui/views/mus/aura_init.cc
+++ b/ui/views/mus/aura_init.cc
@@ -10,7 +10,7 @@
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "build/build_config.h"
-#include "components/resource_provider/public/cpp/resource_loader.h"
+#include "services/catalog/public/cpp/resource_loader.h"
 #include "services/shell/public/cpp/connector.h"
 #include "ui/aura/env.h"
 #include "ui/base/ime/input_method_initializer.h"
@@ -77,12 +77,10 @@ AuraInit::~AuraInit() {
 void AuraInit::InitializeResources(shell::Connector* connector) {
   if (ui::ResourceBundle::HasSharedInstance())
     return;
-  resource_provider::ResourceLoader resource_loader(
+  catalog::ResourceLoader resource_loader(
       connector, GetResourcePaths(resource_file_));
-  CHECK(resource_loader.BlockUntilLoaded());
-  CHECK(resource_loader.loaded());
   ui::RegisterPathProvider();
-  base::File pak_file = resource_loader.ReleaseFile(resource_file_);
+  base::File pak_file = resource_loader.TakeFile(resource_file_);
   base::File pak_file_2 = pak_file.Duplicate();
   ui::ResourceBundle::InitSharedInstanceWithPakFileRegion(
       std::move(pak_file), base::MemoryMappedFile::Region::kWholeFile);