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

Unified Diff: services/ui/service.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: services/ui/service.cc
diff --git a/services/ui/service.cc b/services/ui/service.cc
index 673110cd2f27522009655a1d21d6adaed28af637..7cdd31e1d05cc455ecc9bb6aed2ce817cc1c630a 100644
--- a/services/ui/service.cc
+++ b/services/ui/service.cc
@@ -111,7 +111,10 @@ void Service::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 The reason this CHECKs is because to do otherwise
jonross 2017/05/12 18:08:02 There appears to be a race on short run tests whic
+ LOG(ERROR) << "Service failed to open resource files.\n";
+ return;
+ }
ui::RegisterPathProvider();

Powered by Google App Engine
This is Rietveld 408576698