Revert of Makes window manager include ui pak file

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 "base/path_service.h"
 #include "base/stl_util.h"
 #include "components/mus/common/args.h"
 #include "components/mus/gles2/gpu_impl.h"
 #include "components/mus/surfaces/surfaces_scheduler.h"
 #include "components/mus/ws/client_connection.h"
 #include "components/mus/ws/connection_manager.h"
 #include "components/mus/ws/forwarding_window_manager.h"
 #include "components/mus/ws/window_tree_host_connection.h"
 #include "components/mus/ws/window_tree_host_impl.h"
 #include "components/mus/ws/window_tree_impl.h"
-#include "components/resource_provider/public/cpp/resource_loader.h"
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/base/ui_base_paths.h"
 #include "ui/events/event_switches.h"
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/gl/gl_surface.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 #include "base/command_line.h"
 #include "ui/platform_window/x11/x11_window.h"
 #endif
 
 using mojo::ApplicationConnection;
 using mojo::ApplicationImpl;
 using mojo::InterfaceRequest;
 using mus::mojom::WindowTreeHostFactory;
 using mus::mojom::Gpu;
 
 namespace mus {
-namespace {
-
-void InitResources(ApplicationImpl* app) {
-  const std::string resource_file = "ui_resources_100_percent.pak";
-
-  std::set<std::string> paths;
-  paths.insert(resource_file);
-  resource_provider::ResourceLoader resource_loader(app, paths);
-  CHECK(resource_loader.BlockUntilLoaded());
-  CHECK(resource_loader.loaded());
-  ui::RegisterPathProvider();
-  base::File pak_file = resource_loader.ReleaseFile(resource_file);
-  base::File pak_file_2 = pak_file.Duplicate();
-  ui::ResourceBundle::InitSharedInstanceWithPakFileRegion(
-      pak_file.Pass(), base::MemoryMappedFile::Region::kWholeFile);
-  ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile(
-      pak_file_2.Pass(), ui::SCALE_FACTOR_100P);
-}
-
-}  // namespace
 
 MandolineUIServicesApp::MandolineUIServicesApp()
     : app_impl_(nullptr) {}
 
 MandolineUIServicesApp::~MandolineUIServicesApp() {
   if (gpu_state_)
     gpu_state_->StopControlThread();
   // Destroy |connection_manager_| first, since it depends on |event_source_|.
   connection_manager_.reset();
 }
 
 void MandolineUIServicesApp::Initialize(ApplicationImpl* app) {
-  InitResources(app);
-
   app_impl_ = app;
   surfaces_state_ = new SurfacesState;
 
 #if defined(USE_X11)
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(kUseX11TestConfig)) {
     XInitThreads();
     ui::test::SetUseOverrideRedirectWindowByDefault(true);
   }
 #endif
@@ skipping 87 matching lines @@
       host_client.Pass(), connection_manager_.get(), app_impl_, gpu_state_,
       surfaces_state_, window_manager.Pass());
 
   // WindowTreeHostConnection manages its own lifetime.
   host_impl->Init(new ws::WindowTreeHostConnectionImpl(
       host.Pass(), make_scoped_ptr(host_impl), tree_client.Pass(),
       connection_manager_.get()));
 }
 
 }  // namespace mus