Domain Reliability: Simplify configs and reports

components/domain_reliability/context_manager.cc

 // Copyright 2015 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 "components/domain_reliability/context_manager.h"
 
 namespace domain_reliability {
 
 DomainReliabilityContextManager::DomainReliabilityContextManager(
     DomainReliabilityContext::Factory* context_factory)
     : context_factory_(context_factory) {
 }
 
 DomainReliabilityContextManager::~DomainReliabilityContextManager() {
   RemoveAllContexts();
 }
 
 void DomainReliabilityContextManager::RouteBeacon(
-    const GURL& url,
-    const DomainReliabilityBeacon& beacon) {
-  DomainReliabilityContext* context = GetContextForHost(url.host());
+    scoped_ptr<DomainReliabilityBeacon> beacon) {
+  DomainReliabilityContext* context = GetContextForHost(beacon->url.host());
   if (!context)
     return;
 
-  context->OnBeacon(url, beacon);
+  context->OnBeacon(beacon.Pass());
 }
 
 void DomainReliabilityContextManager::ClearBeaconsInAllContexts() {
   for (auto& context_entry : contexts_)
     context_entry.second->ClearBeacons();
 }
 
 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.
+  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];
   if (*entry)
     delete *entry;
   *entry = context.release();
   return *entry;
 }
 
 void DomainReliabilityContextManager::RemoveAllContexts() {
@@ skipping 30 matching lines @@
 
   std::string parent_with_asterisk = "*." + host.substr(dot_pos + 1);
   context_it = contexts_.find(parent_with_asterisk);
   if (context_it != contexts_.end())
     return context_it->second;
 
   return nullptr;
 }
 
 }  // namespace domain_reliability