OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/file_util.h" | 6 #include "base/file_util.h" |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/test/trace_event_analyzer.h" | 9 #include "base/test/trace_event_analyzer.h" |
10 #include "base/version.h" | 10 #include "base/version.h" |
(...skipping 29 matching lines...) Expand all Loading... |
40 gpu_test_dir_ = test_dir.AppendASCII("gpu"); | 40 gpu_test_dir_ = test_dir.AppendASCII("gpu"); |
41 } | 41 } |
42 | 42 |
43 virtual void SetUpCommandLine(CommandLine* command_line) { | 43 virtual void SetUpCommandLine(CommandLine* command_line) { |
44 // This enables DOM automation for tab contents. | 44 // This enables DOM automation for tab contents. |
45 EnableDOMAutomation(); | 45 EnableDOMAutomation(); |
46 | 46 |
47 InProcessBrowserTest::SetUpCommandLine(command_line); | 47 InProcessBrowserTest::SetUpCommandLine(command_line); |
48 | 48 |
49 // Do not use mesa if real GPU is required. | 49 // Do not use mesa if real GPU is required. |
50 if (!command_line->HasSwitch("enable-gpu")) { | 50 if (!command_line->HasSwitch("use-gpu-in-tests")) { |
51 #if !defined(OS_MACOSX) | 51 #if !defined(OS_MACOSX) |
52 CHECK(test_launcher_utils::OverrideGLImplementation( | 52 CHECK(test_launcher_utils::OverrideGLImplementation( |
53 command_line, gfx::kGLImplementationOSMesaName)) << | 53 command_line, gfx::kGLImplementationOSMesaName)) << |
54 "kUseGL must not be set by test framework code!"; | 54 "kUseGL must not be set by test framework code!"; |
55 #endif | 55 #endif |
56 } | 56 } |
57 command_line->AppendSwitch(switches::kDisablePopupBlocking); | 57 command_line->AppendSwitch(switches::kDisablePopupBlocking); |
58 } | 58 } |
59 | 59 |
60 void SetupBlacklist(const std::string& json_blacklist) { | 60 void SetupBlacklist(const std::string& json_blacklist) { |
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
318 RunTest(url, "\"SUCCESS\"", false); | 318 RunTest(url, "\"SUCCESS\"", false); |
319 } | 319 } |
320 | 320 |
321 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, CanOpenPopupAndRenderWith2DCanvas) { | 321 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, CanOpenPopupAndRenderWith2DCanvas) { |
322 const FilePath url(FILE_PATH_LITERAL("canvas_popup.html")); | 322 const FilePath url(FILE_PATH_LITERAL("canvas_popup.html")); |
323 RunTest(url, "\"SUCCESS\"", false); | 323 RunTest(url, "\"SUCCESS\"", false); |
324 } | 324 } |
325 | 325 |
326 } // namespace anonymous | 326 } // namespace anonymous |
327 | 327 |
OLD | NEW |