ui: Move gl/ directory out of gfx/, up to ui/.

chrome/test/perf/frame_rate/frame_rate_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 <map>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/test/test_timeouts.h"
 #include "base/test/trace_event_analyzer.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/automation_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/perf/perf_test.h"
 #include "chrome/test/ui/javascript_test_util.h"
 #include "chrome/test/ui/ui_perf_test.h"
 #include "net/base/net_util.h"
-#include "ui/gfx/gl/gl_implementation.h"
-#include "ui/gfx/gl/gl_switches.h"
+#include "ui/gl/gl_implementation.h"
+#include "ui/gl/gl_switches.h"
 
 namespace {
 
 enum FrameRateTestFlags {
   kUseGpu             = 1 << 0, // Only execute test if --enable-gpu, and verify
                                 // that test ran on GPU. This is required for
                                 // tests that run on GPU.
   kForceGpuComposited = 1 << 1, // Force the test to use the compositor.
   kDisableVsync       = 1 << 2, // Do not limit framerate to vertical refresh.
                                 // when on GPU, nor to 60hz when not on GPU.
@@ skipping 253 matching lines @@
     kInternal | kHasRedirect | kUseGpu,
     kInternal | kHasRedirect | kUseGpu | kDisableVsync,
     kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu,
     kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu | kDisableVsync));
 
 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(fireflies)
 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(FishIE)
 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(speedreading)
 
 }  // namespace