Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(596)

Side by Side Diff: chrome/browser/media_uitest.cc

Issue 6722026: Refactor: Move app/gfx/gl ==> ui/gfx/gl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Try removing a dep. Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/gpu_process_host_ui_shim.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "app/gfx/gl/gl_implementation.h"
6 #include "base/basictypes.h" 5 #include "base/basictypes.h"
7 #include "base/file_path.h" 6 #include "base/file_path.h"
8 #include "base/string_util.h" 7 #include "base/string_util.h"
9 #include "base/test/test_timeouts.h" 8 #include "base/test/test_timeouts.h"
10 #include "base/threading/platform_thread.h" 9 #include "base/threading/platform_thread.h"
11 #include "chrome/common/chrome_switches.h" 10 #include "chrome/common/chrome_switches.h"
12 #include "chrome/test/test_launcher_utils.h" 11 #include "chrome/test/test_launcher_utils.h"
13 #include "chrome/test/ui/ui_layout_test.h" 12 #include "chrome/test/ui/ui_layout_test.h"
14 #include "chrome/test/ui/ui_test.h" 13 #include "chrome/test/ui/ui_test.h"
15 #include "net/base/net_util.h" 14 #include "net/base/net_util.h"
15 #include "ui/gfx/gl/gl_implementation.h"
16 16
17 class MediaTest : public UITest { 17 class MediaTest : public UITest {
18 protected: 18 protected:
19 virtual void SetUp() { 19 virtual void SetUp() {
20 EXPECT_TRUE(test_launcher_utils::OverrideGLImplementation( 20 EXPECT_TRUE(test_launcher_utils::OverrideGLImplementation(
21 &launch_arguments_, 21 &launch_arguments_,
22 gfx::kGLImplementationOSMesaName)); 22 gfx::kGLImplementationOSMesaName));
23 23
24 #if defined(OS_MACOSX) 24 #if defined(OS_MACOSX)
25 // Accelerated compositing does not work with OSMesa. AcceleratedSurface 25 // Accelerated compositing does not work with OSMesa. AcceleratedSurface
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 InitializeForLayoutTest(test_dir, media_test_dir, kNoHttpPort); 119 InitializeForLayoutTest(test_dir, media_test_dir, kNoHttpPort);
120 120
121 // Copy resources first. 121 // Copy resources first.
122 for (size_t i = 0; i < arraysize(kResources); ++i) 122 for (size_t i = 0; i < arraysize(kResources); ++i)
123 AddResourceForLayoutTest( 123 AddResourceForLayoutTest(
124 test_dir, media_test_dir.AppendASCII(kResources[i])); 124 test_dir, media_test_dir.AppendASCII(kResources[i]));
125 125
126 for (size_t i = 0; i < arraysize(kMediaTests); ++i) 126 for (size_t i = 0; i < arraysize(kMediaTests); ++i)
127 RunLayoutTest(kMediaTests[i], kNoHttpPort); 127 RunLayoutTest(kMediaTests[i], kNoHttpPort);
128 } 128 }
OLDNEW
« no previous file with comments | « chrome/browser/gpu_process_host_ui_shim.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698