diff options
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/base/test_launcher_utils.cc | 2 | ||||
| -rw-r--r-- | chrome/test/gpu/gpu_crash_browsertest.cc | 2 | ||||
| -rw-r--r-- | chrome/test/gpu/gpu_feature_browsertest.cc | 2 | ||||
| -rw-r--r-- | chrome/test/gpu/gpu_pixel_browsertest.cc | 2 | ||||
| -rw-r--r-- | chrome/test/perf/frame_rate/frame_rate_tests.cc | 4 | ||||
| -rw-r--r-- | chrome/test/perf/rendering/throughput_tests.cc | 4 | ||||
| -rw-r--r-- | chrome/test/ui/ui_test.cc | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/chrome/test/base/test_launcher_utils.cc b/chrome/test/base/test_launcher_utils.cc index e76b682..3895ee7 100644 --- a/chrome/test/base/test_launcher_utils.cc +++ b/chrome/test/base/test_launcher_utils.cc @@ -12,7 +12,7 @@ #include "base/string_number_conversions.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_switches.h" #if defined(USE_ASH) #include "ash/ash_switches.h" diff --git a/chrome/test/gpu/gpu_crash_browsertest.cc b/chrome/test/gpu/gpu_crash_browsertest.cc index 5e3a2836..fc8b4af 100644 --- a/chrome/test/gpu/gpu_crash_browsertest.cc +++ b/chrome/test/gpu/gpu_crash_browsertest.cc @@ -13,7 +13,7 @@ #include "chrome/test/base/test_launcher_utils.h" #include "chrome/test/base/ui_test_utils.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/gl/gl_implementation.h" +#include "ui/gl/gl_implementation.h" namespace { diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc index d57d617..b40a140 100644 --- a/chrome/test/gpu/gpu_feature_browsertest.cc +++ b/chrome/test/gpu/gpu_feature_browsertest.cc @@ -21,7 +21,7 @@ #include "content/test/gpu/gpu_test_config.h" #include "content/test/gpu/test_switches.h" #include "net/base/net_util.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_switches.h" #if defined(OS_MACOSX) #include "ui/surface/io_surface_support_mac.h" #endif diff --git a/chrome/test/gpu/gpu_pixel_browsertest.cc b/chrome/test/gpu/gpu_pixel_browsertest.cc index e9269f1..be2facb 100644 --- a/chrome/test/gpu/gpu_pixel_browsertest.cc +++ b/chrome/test/gpu/gpu_pixel_browsertest.cc @@ -28,8 +28,8 @@ #include "third_party/skia/include/core/SkColor.h" #include "ui/compositor/compositor_setup.h" #include "ui/gfx/codec/png_codec.h" -#include "ui/gfx/gl/gl_switches.h" #include "ui/gfx/size.h" +#include "ui/gl/gl_switches.h" namespace { diff --git a/chrome/test/perf/frame_rate/frame_rate_tests.cc b/chrome/test/perf/frame_rate/frame_rate_tests.cc index f947e13..09e1612 100644 --- a/chrome/test/perf/frame_rate/frame_rate_tests.cc +++ b/chrome/test/perf/frame_rate/frame_rate_tests.cc @@ -19,8 +19,8 @@ #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 { diff --git a/chrome/test/perf/rendering/throughput_tests.cc b/chrome/test/perf/rendering/throughput_tests.cc index 2266de9..3d1bd49 100644 --- a/chrome/test/perf/rendering/throughput_tests.cc +++ b/chrome/test/perf/rendering/throughput_tests.cc @@ -8,8 +8,8 @@ #include "base/json/json_reader.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" -#include "base/stringprintf.h" #include "base/string_number_conversions.h" +#include "base/stringprintf.h" #include "base/test/trace_event_analyzer.h" #include "base/values.h" #include "chrome/browser/net/url_fixer_upper.h" @@ -33,7 +33,7 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/codec/png_codec.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_switches.h" namespace { diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index 36e70ef..b60f361 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -50,7 +50,7 @@ #include "content/common/debug_flags.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" -#include "ui/gfx/gl/gl_implementation.h" +#include "ui/gl/gl_implementation.h" #if defined(OS_WIN) #include "base/win/windows_version.h" |