Enable webgl conformance tests under content/test/gpu in content_browsertests

chrome/test/perf/rendering/latency_tests.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/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/test/test_switches.h"
 #include "base/test/trace_event_analyzer.h"
 #include "base/threading/platform_thread.h"
 #include "base/timer.h"
 #include "base/version.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/tracing.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chrome/test/perf/browser_perf_test.h"
 #include "chrome/test/perf/perf_test.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/test/browser_test_utils.h"
 #include "content/test/gpu/gpu_test_config.h"
 #include "net/base/net_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 // Run with --vmodule=latency_tests=1 to print verbose latency info.
@@ skipping 387 matching lines @@
   if (send_inputs) {
     // Round input_delay_us down to nearest milliseconds. The rounding in timer
     // code rounds up from us to ms, so we need to do our own rounding here.
     int input_delay_ms = input_delay_us / 1000;
     input_delay_ms = (input_delay_ms <= 0) ? 1 : input_delay_ms;
     timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(input_delay_ms),
                  this, &LatencyTest::SendInput);
   }
 
   // Wait for message indicating the test has finished running.
-  ui_test_utils::DOMMessageQueue message_queue;
+  content::DOMMessageQueue message_queue;
   ASSERT_TRUE(message_queue.WaitForMessage(NULL));
 
   timer_.Stop();
 
   std::string json_events;
   ASSERT_TRUE(tracing::EndTracing(&json_events));
 
   analyzer_.reset(TraceAnalyzer::Create(json_events));
   analyzer_->AssociateBeginEndEvents();
   analyzer_->MergeAssociatedEventArgs();
@@ skipping 274 matching lines @@
     kInputHeavy | kInputDirty | kRafHeavy, \
     kInputHeavy | kInputDirty | kRafHeavy | kPaintHeavy, \
     kInputDirty | kPaintHeavy, \
     kInputDirty | kRafHeavy | kPaintHeavy)
 
 INSTANTIATE_TEST_CASE_P(, LatencyTestWebGL, LATENCY_SUITE_MODES());
 INSTANTIATE_TEST_CASE_P(, LatencyTestWebGLThread, LATENCY_SUITE_MODES());
 INSTANTIATE_TEST_CASE_P(, LatencyTestSW, LATENCY_SUITE_MODES());
 
 }  // namespace