Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(176)

Unified Diff: ui/views/mus/aura_init.cc

Issue 2858103002: Have mash_browser_tests recreate BackgroundServiceManager per test (Closed)
Patch Set: Disable broken tests Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/mus/aura_init.cc
diff --git a/ui/views/mus/aura_init.cc b/ui/views/mus/aura_init.cc
index 7f73dc190f410c7ca759ac28be41f692f7b3c29e..e3fc9ea45694e9714e206a54e394cb71307a4a21 100644
--- a/ui/views/mus/aura_init.cc
+++ b/ui/views/mus/aura_init.cc
@@ -110,7 +110,11 @@ void AuraInit::InitializeResources(service_manager::Connector* connector) {
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)) {
sky 2017/05/12 17:16:47 Same comment here.
+ LOG(ERROR) << "AuraInit failed to open resource files.\n";
+ return;
+ }
+
ui::RegisterPathProvider();
base::File pak_file = loader.TakeFile(resource_file_);
base::File pak_file_2 = pak_file.Duplicate();
« services/ui/service.cc ('K') | « testing/buildbot/filters/mash.browser_tests.filter ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698