Eliminate mojo:resource_provider

ui/views/mus/aura_init.cc

 // Copyright 2015 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 "ui/views/mus/aura_init.h"
 
 #include <utility>
 
 #include "base/lazy_instance.h"
 #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"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/views/views_delegate.h"
 
 #if defined(OS_LINUX) && !defined(OS_ANDROID)
 #include "components/font_service/public/cpp/font_loader.h"
@@ skipping 46 matching lines @@
     // thread, otherwise the background thread may be shutdown after the app is
     // torn down, when we're in a bad state.
     font_loader_->Shutdown();
   }
 #endif
 }
 
 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);
   ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile(
       std::move(pak_file_2), ui::SCALE_FACTOR_100P);
 
 // Initialize the skia font code to go ask fontconfig underneath.
 #if defined(OS_LINUX) && !defined(OS_ANDROID)
   font_loader_ = skia::AdoptRef(new font_service::FontLoader(connector));
   SkFontConfigInterface::SetGlobal(font_loader_.get());
 #endif
 
   // There is a bunch of static state in gfx::Font, by running this now,
   // before any other apps load, we ensure all the state is set up.
   gfx::Font();
 }
 
 }  // namespace views