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

Unified Diff: base/trace_event/trace_config.cc

Issue 1226673003: Move MatchPattern to its own header and the base namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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
« no previous file with comments | « base/test/trace_event_analyzer.cc ('k') | base/trace_event/trace_event_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/trace_event/trace_config.cc
diff --git a/base/trace_event/trace_config.cc b/base/trace_event/trace_config.cc
index ef9b8925fff6cd1144d2bf48bcdc0f88f3e48fd4..2a15ec578fcef0b531dae328657c993d9e99c853 100644
--- a/base/trace_event/trace_config.cc
+++ b/base/trace_event/trace_config.cc
@@ -6,6 +6,7 @@
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
+#include "base/strings/pattern.h"
#include "base/strings/string_split.h"
#include "base/strings/string_tokenizer.h"
#include "base/strings/stringprintf.h"
@@ -147,8 +148,8 @@ bool TraceConfig::IsCategoryGroupEnabled(
if (IsCategoryEnabled(category_group_token.c_str())) {
return true;
}
- if (!MatchPattern(category_group_token.c_str(),
- TRACE_DISABLED_BY_DEFAULT("*")))
+ if (!base::MatchPattern(category_group_token.c_str(),
+ TRACE_DISABLED_BY_DEFAULT("*")))
had_enabled_by_default = true;
}
// Do a second pass to check for explicitly disabled categories
@@ -160,7 +161,7 @@ bool TraceConfig::IsCategoryGroupEnabled(
for (StringList::const_iterator ci = excluded_categories_.begin();
ci != excluded_categories_.end();
++ci) {
- if (MatchPattern(category_group_token.c_str(), ci->c_str())) {
+ if (base::MatchPattern(category_group_token.c_str(), ci->c_str())) {
// Current token of category_group_name is present in excluded_list.
// Flag the exclusion and proceed further to check if any of the
// remaining categories of category_group_name is not present in the
@@ -515,17 +516,17 @@ bool TraceConfig::IsCategoryEnabled(const char* category_name) const {
for (ci = disabled_categories_.begin();
ci != disabled_categories_.end();
++ci) {
- if (MatchPattern(category_name, ci->c_str()))
+ if (base::MatchPattern(category_name, ci->c_str()))
return true;
}
- if (MatchPattern(category_name, TRACE_DISABLED_BY_DEFAULT("*")))
+ if (base::MatchPattern(category_name, TRACE_DISABLED_BY_DEFAULT("*")))
return false;
for (ci = included_categories_.begin();
ci != included_categories_.end();
++ci) {
- if (MatchPattern(category_name, ci->c_str()))
+ if (base::MatchPattern(category_name, ci->c_str()))
return true;
}
« no previous file with comments | « base/test/trace_event_analyzer.cc ('k') | base/trace_event/trace_event_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698