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

Unified Diff: base/test/trace_event_analyzer.cc

Issue 1641513004: Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 4 years, 11 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/test_support_ios.mm ('k') | base/third_party/nspr/prtime.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/test/trace_event_analyzer.cc
diff --git a/base/test/trace_event_analyzer.cc b/base/test/trace_event_analyzer.cc
index e46c2a517071025f18a5d21313bc38dc4f65b95c..93d7f305cc320547ad705804946381b493db25b2 100644
--- a/base/test/trace_event_analyzer.cc
+++ b/base/test/trace_event_analyzer.cc
@@ -10,6 +10,7 @@
#include "base/json/json_reader.h"
#include "base/memory/scoped_ptr.h"
+#include "base/strings/pattern.h"
#include "base/values.h"
namespace trace_analyzer {
@@ -321,17 +322,17 @@ bool Query::CompareAsString(const TraceEvent& event, bool* result) const {
switch (operator_) {
case OP_EQ:
if (right().is_pattern_)
- *result = MatchPattern(lhs, rhs);
+ *result = base::MatchPattern(lhs, rhs);
else if (left().is_pattern_)
- *result = MatchPattern(rhs, lhs);
+ *result = base::MatchPattern(rhs, lhs);
else
*result = (lhs == rhs);
return true;
case OP_NE:
if (right().is_pattern_)
- *result = !MatchPattern(lhs, rhs);
+ *result = !base::MatchPattern(lhs, rhs);
else if (left().is_pattern_)
- *result = !MatchPattern(rhs, lhs);
+ *result = !base::MatchPattern(rhs, lhs);
else
*result = (lhs != rhs);
return true;
« no previous file with comments | « base/test/test_support_ios.mm ('k') | base/third_party/nspr/prtime.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698