Load ash_sysui resources with ResourceLoader.

components/mus/mus_app.cc

 // Copyright 2014 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/mus/mus_app.h"
 
 #include <set>
 
 #include "base/memory/weak_ptr.h"
 #include "base/stl_util.h"
@@ skipping 71 matching lines @@
 
 void MandolineUIServicesApp::InitializeResources(mojo::Connector* connector) {
   if (ui::ResourceBundle::HasSharedInstance())
     return;
 
   std::set<std::string> resource_paths;
   resource_paths.insert(kResourceFileStrings);
   resource_paths.insert(kResourceFile100);
   resource_paths.insert(kResourceFile200);
 
-  resource_provider::ResourceLoader resource_loader(connector, resource_paths);
-  if (!resource_loader.BlockUntilLoaded())
+  resource_provider::ResourceLoader loader(connector, resource_paths);
+  if (!loader.BlockUntilLoaded())
     return;
-  CHECK(resource_loader.loaded());
   ui::RegisterPathProvider();
 
   // Initialize resource bundle with 1x and 2x cursor bitmaps.
   ui::ResourceBundle::InitSharedInstanceWithPakFileRegion(
-      resource_loader.ReleaseFile(kResourceFileStrings),
+      loader.ReleaseFile(kResourceFileStrings),
       base::MemoryMappedFile::Region::kWholeFile);
-  ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile(
-      resource_loader.ReleaseFile(kResourceFile100), ui::SCALE_FACTOR_100P);
-  ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile(
-      resource_loader.ReleaseFile(kResourceFile200), ui::SCALE_FACTOR_200P);
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  rb.AddDataPackFromFile(loader.ReleaseFile(kResourceFile100),
+                         ui::SCALE_FACTOR_100P);
+  rb.AddDataPackFromFile(loader.ReleaseFile(kResourceFile200),
+                         ui::SCALE_FACTOR_200P);
 }
 
 MandolineUIServicesApp::UserState* MandolineUIServicesApp::GetUserState(
     mojo::Connection* connection) {
   const ws::UserId& user_id = connection->GetRemoteIdentity().user_id();
   auto it = user_id_to_user_state_.find(user_id);
   if (it != user_id_to_user_state_.end())
     return it->second.get();
   user_id_to_user_state_[user_id] = make_scoped_ptr(new UserState);
   return user_id_to_user_state_[user_id].get();
@@ skipping 134 matching lines @@
   user_state->window_tree_host_factory->AddBinding(std::move(request));
 }
 
 void MandolineUIServicesApp::Create(mojo::Connection* connection,
                                     mojom::GpuRequest request) {
   DCHECK(platform_display_init_params_.gpu_state);
   new GpuImpl(std::move(request), platform_display_init_params_.gpu_state);
 }
 
 }  // namespace mus