summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-28 19:24:49 +0000
committerbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-28 19:24:49 +0000
commit5ae0b28229648b8b5d26624a45f3fffca4e545fd (patch)
treea97b457285d90a49521a360e7cad015fbd7e2474 /chrome/test
parent2f4aec1e3e10cac458f44747d650c2336e220554 (diff)
downloadchromium_src-5ae0b28229648b8b5d26624a45f3fffca4e545fd.zip
chromium_src-5ae0b28229648b8b5d26624a45f3fffca4e545fd.tar.gz
chromium_src-5ae0b28229648b8b5d26624a45f3fffca4e545fd.tar.bz2
Refactor: Move app/gfx/gl ==> ui/gfx/gl
This is the final patch in the sequence. Note that gl.gyp is introduced because dependency checking on the Mac is done on a per file (rather than per target) basis. BUG=none TEST=trybots Review URL: http://codereview.chromium.org/6722026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79599 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/gpu/gpu_browsertest.cc4
-rw-r--r--chrome/test/gpu/gpu_crash.cc2
-rw-r--r--chrome/test/gpu/gpu_pixel_browsertest.cc2
-rw-r--r--chrome/test/gpu/gpu_uitest.cc4
-rw-r--r--chrome/test/ui/ui_test.cc2
5 files changed, 7 insertions, 7 deletions
diff --git a/chrome/test/gpu/gpu_browsertest.cc b/chrome/test/gpu/gpu_browsertest.cc
index d96915b..d3d6879 100644
--- a/chrome/test/gpu/gpu_browsertest.cc
+++ b/chrome/test/gpu/gpu_browsertest.cc
@@ -1,8 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "app/gfx/gl/gl_implementation.h"
#include "base/command_line.h"
#include "base/path_service.h"
#include "base/string16.h"
@@ -17,6 +16,7 @@
#include "content/browser/tab_contents/tab_contents.h"
#include "googleurl/src/gurl.h"
#include "net/base/net_util.h"
+#include "ui/gfx/gl/gl_implementation.h"
class GPUBrowserTest : public InProcessBrowserTest {
protected:
diff --git a/chrome/test/gpu/gpu_crash.cc b/chrome/test/gpu/gpu_crash.cc
index 8f134ee..b0d090b 100644
--- a/chrome/test/gpu/gpu_crash.cc
+++ b/chrome/test/gpu/gpu_crash.cc
@@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "app/gfx/gl/gl_implementation.h"
#include "base/command_line.h"
#include "base/path_service.h"
#include "base/utf_string_conversions.h"
@@ -15,6 +14,7 @@
#include "chrome/test/ui_test_utils.h"
#include "content/browser/tab_contents/tab_contents.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gfx/gl/gl_implementation.h"
namespace {
diff --git a/chrome/test/gpu/gpu_pixel_browsertest.cc b/chrome/test/gpu/gpu_pixel_browsertest.cc
index 1afa3a6..862d0ba 100644
--- a/chrome/test/gpu/gpu_pixel_browsertest.cc
+++ b/chrome/test/gpu/gpu_pixel_browsertest.cc
@@ -5,7 +5,6 @@
#include <string>
#include <vector>
-#include "app/gfx/gl/gl_implementation.h"
#include "base/callback.h"
#include "base/command_line.h"
#include "base/file_path.h"
@@ -31,6 +30,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_implementation.h"
#include "ui/gfx/gl/gl_switches.h"
#include "ui/gfx/size.h"
diff --git a/chrome/test/gpu/gpu_uitest.cc b/chrome/test/gpu/gpu_uitest.cc
index a392982..65b738e 100644
--- a/chrome/test/gpu/gpu_uitest.cc
+++ b/chrome/test/gpu/gpu_uitest.cc
@@ -1,15 +1,15 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 <string>
-#include "app/gfx/gl/gl_implementation.h"
#include "build/build_config.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/test/test_launcher_utils.h"
#include "chrome/test/ui/ui_test.h"
#include "net/base/net_util.h"
+#include "ui/gfx/gl/gl_implementation.h"
class GPUUITest : public UITest {
protected:
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index c2f5891..2e47340 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -12,7 +12,6 @@
#include <set>
#include <vector>
-#include "app/gfx/gl/gl_implementation.h"
#include "app/sql/connection.h"
#include "base/base_switches.h"
#include "base/command_line.h"
@@ -50,6 +49,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/gfx/gl/gl_switches.h"
#if defined(OS_WIN)