Index: components/domain_reliability/context_manager.cc |
diff --git a/components/domain_reliability/context_manager.cc b/components/domain_reliability/context_manager.cc |
index b06d7fd11e4d48e63bc3945c45dd78824480b6d9..c05e5c8a23e15e926fc137d38e6df9cc93f4e0ac 100644 |
--- a/components/domain_reliability/context_manager.cc |
+++ b/components/domain_reliability/context_manager.cc |
@@ -16,13 +16,12 @@ DomainReliabilityContextManager::~DomainReliabilityContextManager() { |
} |
void DomainReliabilityContextManager::RouteBeacon( |
- const GURL& url, |
- const DomainReliabilityBeacon& beacon) { |
- DomainReliabilityContext* context = GetContextForHost(url.host()); |
+ scoped_ptr<DomainReliabilityBeacon> beacon) { |
+ DomainReliabilityContext* context = GetContextForHost(beacon->url.host()); |
davidben
2015/10/20 23:35:54
How does contexts having an origin, but still havi
Deprecated (see juliatuttle)
2015/10/26 19:08:41
We're still only paying attention to the host for
|
if (!context) |
return; |
- context->OnBeacon(url, beacon); |
+ context->OnBeacon(beacon.Pass()); |
} |
void DomainReliabilityContextManager::ClearBeaconsInAllContexts() { |
@@ -32,7 +31,15 @@ void DomainReliabilityContextManager::ClearBeaconsInAllContexts() { |
DomainReliabilityContext* DomainReliabilityContextManager::AddContextForConfig( |
scoped_ptr<const DomainReliabilityConfig> config) { |
- std::string domain = config->domain; |
+ // TODO(ttuttle): Convert this to actual origin. |
+ |
+ // For some reason, initializing |wildcard_prefix| with a ternary operator |
+ // makes ASAN mad. |
davidben
2015/10/20 23:35:54
Merp. I don't suppose you remember what the failur
Deprecated (see juliatuttle)
2015/10/26 19:08:41
I don't remember what it was off the top of my hea
|
+ std::string wildcard_prefix = ""; |
+ if (config->include_subdomains) |
+ wildcard_prefix = "*."; |
+ |
+ std::string domain = wildcard_prefix + config->origin.host(); |
scoped_ptr<DomainReliabilityContext> context = |
context_factory_->CreateContextForConfig(config.Pass()); |
DomainReliabilityContext** entry = &contexts_[domain]; |