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

Unified Diff: services/service_manager/service_manager.cc

Issue 2552873002: Don't CHECK in service manager when loading service from disk package (Closed)
Patch Set: remove include Created 4 years 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/service_manager/service_manager.cc
diff --git a/services/service_manager/service_manager.cc b/services/service_manager/service_manager.cc
index 9a31773541dceaf5df3de22dadbf1821ed8ae70f..dab2bd76dabab389e0279c67231b44db501aca2f 100644
--- a/services/service_manager/service_manager.cc
+++ b/services/service_manager/service_manager.cc
@@ -10,7 +10,6 @@
#include "base/bind.h"
#include "base/command_line.h"
-#include "base/debug/alias.h"
#include "base/guid.h"
#include "base/logging.h"
#include "base/macros.h"
@@ -928,19 +927,8 @@ void ServiceManager::OnGotResolvedName(std::unique_ptr<ConnectParams> params,
package_path = result->package_path;
}
- Identity source_instance_identity;
- base::debug::Alias(&has_source_instance);
- base::debug::Alias(&package_path);
- base::debug::Alias(&source);
- base::debug::Alias(&target);
- if (source_instance)
- source_instance_identity = source_instance->identity();
- base::debug::Alias(&source_instance_identity);
-#if defined(GOOGLE_CHROME_BUILD)
- // We do not currently want to hit this code path in production, but it's
- // happening somehow. https://crbug.com/649673.
- CHECK(false);
-#endif
+ // TODO(rockot): Find a way to block this code path for content but allow
+ // it for chrome_mash.
instance->StartWithFilePath(package_path);
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698