Have mash_browser_tests recreate BackgroundServiceManager per test

services/ui/service.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 "services/ui/service.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 82 matching lines @@
   // Destroy |window_server_| first, since it depends on |event_source_|.
   // WindowServer (or more correctly its Displays) may have state that needs to
   // be destroyed before GpuState as well.
   window_server_.reset();
 
 #if defined(USE_OZONE)
   OzonePlatform::Shutdown();
 #endif
 }
 
-void Service::InitializeResources(service_manager::Connector* connector) {
+bool Service::InitializeResources(service_manager::Connector* connector) {
   if (ui::ResourceBundle::HasSharedInstance())
-    return;
+    return true;
 
   std::set<std::string> resource_paths;
   resource_paths.insert(kResourceFileStrings);
   resource_paths.insert(kResourceFile100);
   resource_paths.insert(kResourceFile200);
 
   catalog::ResourceLoader loader;
   filesystem::mojom::DirectoryPtr directory;
   connector->BindInterface(catalog::mojom::kServiceName, &directory);
-  CHECK(loader.OpenFiles(std::move(directory), resource_paths));
+  if (!loader.OpenFiles(std::move(directory), resource_paths)) {
+    LOG(ERROR) << "Service failed to open resource files.\n";

[sky, 2017/05/18 20:30:27]

no need for the \n here.

[jonross, 2017/05/18 20:40:24]

Done.

+    return false;
+  }
 
   ui::RegisterPathProvider();
 
   // Initialize resource bundle with 1x and 2x cursor bitmaps.
   ui::ResourceBundle::InitSharedInstanceWithPakFileRegion(
       loader.TakeFile(kResourceFileStrings),
       base::MemoryMappedFile::Region::kWholeFile);
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   rb.AddDataPackFromFile(loader.TakeFile(kResourceFile100),
                          ui::SCALE_FACTOR_100P);
   rb.AddDataPackFromFile(loader.TakeFile(kResourceFile200),
                          ui::SCALE_FACTOR_200P);
+  return true;
 }
 
 Service::UserState* Service::GetUserState(
     const service_manager::Identity& remote_identity) {
   const ws::UserId& user_id = remote_identity.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] = base::WrapUnique(new UserState);
   return user_id_to_user_state_[user_id].get();
@@ skipping 11 matching lines @@
   test_config_ = base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kUseTestConfig);
 #if defined(USE_X11)
   XInitThreads();
   ui::SetDefaultX11ErrorHandlers();
 #endif
 
   if (test_config_)
     ui::test::EnableTestConfigForPlatformWindows();
 
-  InitializeResources(context()->connector());
+  // If resources are unavailable do not complete start-up.
+  if (!InitializeResources(context()->connector())) {
+    context()->QuitNow();
+    return;
+  }
 
 #if defined(USE_OZONE)
   // The ozone platform can provide its own event source. So initialize the
   // platform before creating the default event source.
   // Because GL libraries need to be initialized before entering the sandbox,
   // in MUS, |InitializeForUI| will load the GL libraries.
   ui::OzonePlatform::InitParams params;
   params.connector = context()->connector();
   params.single_process = false;
   ui::OzonePlatform::InitializeForUI(params);
@@ skipping 252 matching lines @@
     mojom::WindowServerTestRequest request) {
   if (!test_config_)
     return;
   mojo::MakeStrongBinding(
       base::MakeUnique<ws::WindowServerTestImpl>(window_server_.get()),
       std::move(request));
 }
 
 
 }  // namespace ui