OLD | NEW |
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 "base/basictypes.h" | 5 #include "base/basictypes.h" |
6 #include "base/file_path.h" | 6 #include "base/file_path.h" |
7 #include "base/stringprintf.h" | 7 #include "base/stringprintf.h" |
8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
9 #include "base/test/test_timeouts.h" | 9 #include "base/test/test_timeouts.h" |
10 #include "base/threading/platform_thread.h" | 10 #include "base/threading/platform_thread.h" |
11 #include "chrome/common/chrome_switches.h" | 11 #include "chrome/common/chrome_switches.h" |
12 #include "chrome/test/test_launcher_utils.h" | 12 #include "chrome/test/base/test_launcher_utils.h" |
13 #include "chrome/test/ui/ui_layout_test.h" | 13 #include "chrome/test/ui/ui_layout_test.h" |
14 #include "chrome/test/ui/ui_test.h" | 14 #include "chrome/test/ui/ui_test.h" |
15 #include "net/base/net_util.h" | 15 #include "net/base/net_util.h" |
16 #include "ui/gfx/gl/gl_implementation.h" | 16 #include "ui/gfx/gl/gl_implementation.h" |
17 | 17 |
18 class MediaTest : public UITest { | 18 class MediaTest : public UITest { |
19 protected: | 19 protected: |
20 virtual void SetUp() { | 20 virtual void SetUp() { |
21 EXPECT_TRUE(test_launcher_utils::OverrideGLImplementation( | 21 EXPECT_TRUE(test_launcher_utils::OverrideGLImplementation( |
22 &launch_arguments_, | 22 &launch_arguments_, |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
130 InitializeForLayoutTest(test_dir, media_test_dir, kNoHttpPort); | 130 InitializeForLayoutTest(test_dir, media_test_dir, kNoHttpPort); |
131 | 131 |
132 // Copy resources first. | 132 // Copy resources first. |
133 for (size_t i = 0; i < arraysize(kResources); ++i) | 133 for (size_t i = 0; i < arraysize(kResources); ++i) |
134 AddResourceForLayoutTest( | 134 AddResourceForLayoutTest( |
135 test_dir, media_test_dir.AppendASCII(kResources[i])); | 135 test_dir, media_test_dir.AppendASCII(kResources[i])); |
136 | 136 |
137 for (size_t i = 0; i < arraysize(kMediaTests); ++i) | 137 for (size_t i = 0; i < arraysize(kMediaTests); ++i) |
138 RunLayoutTest(kMediaTests[i], kNoHttpPort); | 138 RunLayoutTest(kMediaTests[i], kNoHttpPort); |
139 } | 139 } |
OLD | NEW |