Remove usage of using namespace, and cleanup trace_analyzer namespace

chrome/test/gpu/gpu_feature_browsertest.cc

 // Copyright (c) 2012 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 "base/command_line.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/test/trace_event_analyzer.h"
 #include "base/version.h"
@@ skipping 72 matching lines @@
     }
 
     std::string result;
     // Wait for message indicating the test has finished running.
     ASSERT_TRUE(message_queue.WaitForMessage(&result));
     if (expected_reply)
       EXPECT_STREQ(expected_reply, result.c_str());
   }
 
   void RunTest(const FilePath& url, GpuResultFlags expectations) {
-    using namespace trace_analyzer;
+    using trace_analyzer::Query;
+    using trace_analyzer::TraceAnalyzer;
 
     ASSERT_TRUE(tracing::BeginTracing("test_gpu"));
 
     // Have to use a new tab for the blacklist to work.
     RunTest(url, NULL, true);
 
     std::string json_events;
     ASSERT_TRUE(tracing::EndTracing(&json_events));
 
     scoped_ptr<TraceAnalyzer> analyzer(TraceAnalyzer::Create(json_events));
     analyzer->AssociateBeginEndEvents();
-    TraceEventVector events;
+    trace_analyzer::TraceEventVector events;
 
     // This measurement is flaky, because the GPU process is sometimes
     // started before the test (always with force-compositing-mode on CrOS).
     if (expectations & EXPECT_NO_GPU_PROCESS) {
       EXPECT_EQ(0u, analyzer->FindEvents(
           Query::MatchBeginName("OnGraphicsInfoCollected"), &events));
     }
 
     // Check for swap buffers if expected:
     if (expectations & EXPECT_GPU_SWAP_BUFFERS) {
-      EXPECT_GT(analyzer->FindEvents(Query(EVENT_NAME) ==
+      EXPECT_GT(analyzer->FindEvents(Query::EventName() ==
                                      Query::String("SwapBuffers"), &events),
                 size_t(0));
     }
   }
 
  protected:
   FilePath gpu_test_dir_;
 };
 
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, AcceleratedCompositingAllowed) {
@@ skipping 189 matching lines @@
   RunTest(url, "\"SUCCESS\"", false);
 }
 
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, CanOpenPopupAndRenderWith2DCanvas) {
   const FilePath url(FILE_PATH_LITERAL("canvas_popup.html"));
   RunTest(url, "\"SUCCESS\"", false);
 }
 
 }  // namespace anonymous