Remove usage of using namespace, and cleanup trace_analyzer namespace

base/test/trace_event_analyzer.cc

Index: base/test/trace_event_analyzer.cc
diff --git a/base/test/trace_event_analyzer.cc b/base/test/trace_event_analyzer.cc
index a60250ab6fc2a3a84f6d1e24150deb39d6cae2d3..9813f14785ccbedc93d75e3c2ad2f446ab5b0a77 100644
--- a/base/test/trace_event_analyzer.cc
+++ b/base/test/trace_event_analyzer.cc
@@ -674,26 +674,26 @@ bool TraceAnalyzer::SetEvents(const std::string& json_events) {
 }
 
 void TraceAnalyzer::AssociateBeginEndEvents() {
-  using namespace trace_analyzer;
+  using trace_analyzer::Query;
 
-  Query begin(Query(EVENT_PHASE) == Query::Phase(TRACE_EVENT_PHASE_BEGIN));
-  Query end(Query(EVENT_PHASE) == Query::Phase(TRACE_EVENT_PHASE_END));
-  Query match(Query(EVENT_NAME) == Query(OTHER_NAME) &&
-              Query(EVENT_CATEGORY) == Query(OTHER_CATEGORY) &&
-              Query(EVENT_TID) == Query(OTHER_TID) &&
-              Query(EVENT_PID) == Query(OTHER_PID));
+  Query begin(Query::EventPhase() == Query::Phase(TRACE_EVENT_PHASE_BEGIN));
+  Query end(Query::EventPhase() == Query::Phase(TRACE_EVENT_PHASE_END));
+  Query match(Query::EventName() == Query::OtherName() &&
+              Query::EventCategory() == Query::OtherCategory() &&
+              Query::EventTid() == Query::OtherTid() &&
+              Query::EventPid() == Query::OtherPid());
 
   AssociateEvents(begin, end, match);
 }
 
 void TraceAnalyzer::AssociateStartFinishEvents() {
-  using namespace trace_analyzer;
+  using trace_analyzer::Query;
 
-  Query begin(Query(EVENT_PHASE) == Query::Phase(TRACE_EVENT_PHASE_START));
-  Query end(Query(EVENT_PHASE) == Query::Phase(TRACE_EVENT_PHASE_FINISH));
-  Query match(Query(EVENT_NAME) == Query(OTHER_NAME) &&
-              Query(EVENT_CATEGORY) == Query(OTHER_CATEGORY) &&
-              Query(EVENT_ID) == Query(OTHER_ID));
+  Query begin(Query::EventPhase() == Query::Phase(TRACE_EVENT_PHASE_START));
+  Query end(Query::EventPhase() == Query::Phase(TRACE_EVENT_PHASE_FINISH));
+  Query match(Query::EventName() == Query::OtherName() &&
+              Query::EventCategory() == Query::OtherCategory() &&
+              Query::EventId() == Query::OtherId());
 
   AssociateEvents(begin, end, match);
 }