[subresource_filter] Add debugging trace events around activation

components/subresource_filter/core/browser/subresource_filter_features.cc

 // Copyright 2016 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/subresource_filter/core/browser/subresource_filter_features.h"
 
 #include <map>
 #include <ostream>
 #include <sstream>
 #include <string>
 #include <tuple>
 #include <utility>
 
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
+#include "base/memory/ptr_util.h"
 #include "base/metrics/field_trial_params.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/synchronization/lock.h"
+#include "base/trace_event/trace_event_argument.h"
 #include "base/values.h"
 #include "components/variations/variations_associated_data.h"
 
 namespace subresource_filter {
 
 namespace {
 
 // Helpers --------------------------------------------------------------------
 
 class CommaSeparatedStrings {
@@ skipping 180 matching lines @@
     const std::vector<Configuration>& configs) {
   base::StringPiece greatest_flavor;
   for (const auto& config : configs) {
     base::StringPiece flavor = config.general_settings.ruleset_flavor;
     if (flavor > greatest_flavor)
       greatest_flavor = flavor;
   }
   return greatest_flavor;
 }
 
+std::unique_ptr<base::DictionaryValue> ConfigToDictionaryValue(
+    const Configuration& config) {
+  auto dict = base::MakeUnique<base::DictionaryValue>();
+  dict->SetString(
+      "activation_scope",
+      StreamToString(config.activation_conditions.activation_scope));
+  dict->SetString("activation_list",
+                  StreamToString(config.activation_conditions.activation_list));
+  dict->SetInteger("priority", config.activation_conditions.priority);
+  dict->SetString("activation_level",
+                  StreamToString(config.activation_options.activation_level));
+  dict->SetDouble("performance_measurement_rate",
+                  config.activation_options.performance_measurement_rate);
+  dict->SetBoolean("should_suppress_notifications",
+                   config.activation_options.should_suppress_notifications);
+  dict->SetBoolean("should_whitelist_site_on_reload",
+                   config.activation_options.should_whitelist_site_on_reload);
+  dict->SetString("ruleset_flavor",
+                  StreamToString(config.general_settings.ruleset_flavor));
+  return dict;
+}
+
 // Globals --------------------------------------------------------------------
 
 base::LazyInstance<base::Lock>::Leaky g_active_configurations_lock =
     LAZY_INSTANCE_INITIALIZER;
 
 base::LazyInstance<scoped_refptr<ConfigurationList>>::Leaky
     g_active_configurations = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
@@ skipping 82 matching lines @@
                     config.general_settings.ruleset_flavor);
   };
   return tie(*this) == tie(rhs);
 }
 
 bool Configuration::operator!=(const Configuration& rhs) const {
   return !(*this == rhs);
 }
 
 std::ostream& operator<<(std::ostream& os, const Configuration& config) {
-  base::DictionaryValue dict;
-  dict.SetString("activation_scope",
-                 StreamToString(config.activation_conditions.activation_scope));
-  dict.SetString("activation_list",
-                 StreamToString(config.activation_conditions.activation_list));
-  dict.SetInteger("priority", config.activation_conditions.priority);
-  dict.SetString("activation_level",
-                 StreamToString(config.activation_options.activation_level));
-  dict.SetDouble("performance_measurement_rate",
-                 config.activation_options.performance_measurement_rate);
-  dict.SetBoolean("should_suppress_notifications",
-                  config.activation_options.should_suppress_notifications);
-  dict.SetBoolean("should_whitelist_site_on_reload",
-                  config.activation_options.should_whitelist_site_on_reload);
-  dict.SetString("ruleset_flavor",
-                 StreamToString(config.general_settings.ruleset_flavor));
+  std::unique_ptr<base::DictionaryValue> dict = ConfigToDictionaryValue(config);
   std::string json;
   base::JSONWriter::WriteWithOptions(
-      dict, base::JSONWriter::OPTIONS_PRETTY_PRINT, &json);
+      *dict, base::JSONWriter::OPTIONS_PRETTY_PRINT, &json);
   return os << json;
 }
 
+std::unique_ptr<base::trace_event::TracedValue> Configuration::GetTracedValue()
+    const {
+  auto value = base::MakeUnique<base::trace_event::TracedValue>();
+  value->SetValue("Configuration", ConfigToDictionaryValue(*this));

[engedy, 2017/05/15 12:10:38]

nit: Note that this method is deprecated. Might want to discuss with primiano@.

[Charlie Harrison, 2017/05/15 15:14:22]

Discussed with Primiano who recommended we use the TracedValue::ToBaseValue to
generate the logging string. I've done that and moved operator<< to the
test_support file.

+  return value;
+}
+
 // ConfigurationList ----------------------------------------------------------
 
 ConfigurationList::ConfigurationList(std::vector<Configuration> configs)
     : configs_by_decreasing_priority_(
           SortConfigsByDecreasingPriority(std::move(configs))),
       lexicographically_greatest_ruleset_flavor_(
           GetLexicographicallyGreatestRulesetFlavor(
               configs_by_decreasing_priority_)) {}
 ConfigurationList::~ConfigurationList() = default;
 
@@ skipping 12 matching lines @@
     scoped_refptr<ConfigurationList> new_configs) {
   base::AutoLock lock(g_active_configurations_lock.Get());
   auto old_configs = std::move(g_active_configurations.Get());
   g_active_configurations.Get() = std::move(new_configs);
   return old_configs;
 }
 
 }  // namespace testing
 
 }  // namespace subresource_filter