| 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/path_service.h" | 6 #include "base/path_service.h" |
| 7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
| 8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
| 9 #include "chrome/browser/ui/browser_commands.h" | 9 #include "chrome/browser/ui/browser_commands.h" |
| 10 #include "chrome/common/chrome_paths.h" | 10 #include "chrome/common/chrome_paths.h" |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 virtual void SetUpInProcessBrowserTestFixture() { | 40 virtual void SetUpInProcessBrowserTestFixture() { |
| 41 FilePath test_dir; | 41 FilePath test_dir; |
| 42 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir)); | 42 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir)); |
| 43 gpu_test_dir_ = test_dir.AppendASCII("gpu"); | 43 gpu_test_dir_ = test_dir.AppendASCII("gpu"); |
| 44 } | 44 } |
| 45 FilePath gpu_test_dir_; | 45 FilePath gpu_test_dir_; |
| 46 }; | 46 }; |
| 47 | 47 |
| 48 // Currently Kill times out on GPU bots: http://crbug.com/101513 | 48 // Currently Kill times out on GPU bots: http://crbug.com/101513 |
| 49 IN_PROC_BROWSER_TEST_F(GPUCrashTest, DISABLED_Kill) { | 49 IN_PROC_BROWSER_TEST_F(GPUCrashTest, DISABLED_Kill) { |
| 50 ui_test_utils::DOMMessageQueue message_queue; | 50 content::DOMMessageQueue message_queue; |
| 51 | 51 |
| 52 ui_test_utils::NavigateToURL( | 52 ui_test_utils::NavigateToURL( |
| 53 browser(), | 53 browser(), |
| 54 content::GetFileUrlWithQuery( | 54 content::GetFileUrlWithQuery( |
| 55 gpu_test_dir_.AppendASCII("webgl.html"), "query=kill")); | 55 gpu_test_dir_.AppendASCII("webgl.html"), "query=kill")); |
| 56 SimulateGPUCrash(browser()); | 56 SimulateGPUCrash(browser()); |
| 57 | 57 |
| 58 std::string m; | 58 std::string m; |
| 59 ASSERT_TRUE(message_queue.WaitForMessage(&m)); | 59 ASSERT_TRUE(message_queue.WaitForMessage(&m)); |
| 60 EXPECT_EQ("\"SUCCESS\"", m); | 60 EXPECT_EQ("\"SUCCESS\"", m); |
| 61 } | 61 } |
| 62 | 62 |
| 63 | 63 |
| 64 IN_PROC_BROWSER_TEST_F(GPUCrashTest, WebkitLoseContext) { | 64 IN_PROC_BROWSER_TEST_F(GPUCrashTest, WebkitLoseContext) { |
| 65 ui_test_utils::DOMMessageQueue message_queue; | 65 content::DOMMessageQueue message_queue; |
| 66 | 66 |
| 67 ui_test_utils::NavigateToURL( | 67 ui_test_utils::NavigateToURL( |
| 68 browser(), | 68 browser(), |
| 69 content::GetFileUrlWithQuery( | 69 content::GetFileUrlWithQuery( |
| 70 gpu_test_dir_.AppendASCII("webgl.html"), | 70 gpu_test_dir_.AppendASCII("webgl.html"), |
| 71 "query=WEBGL_lose_context")); | 71 "query=WEBGL_lose_context")); |
| 72 | 72 |
| 73 std::string m; | 73 std::string m; |
| 74 ASSERT_TRUE(message_queue.WaitForMessage(&m)); | 74 ASSERT_TRUE(message_queue.WaitForMessage(&m)); |
| 75 EXPECT_EQ("\"SUCCESS\"", m); | 75 EXPECT_EQ("\"SUCCESS\"", m); |
| 76 } | 76 } |
| OLD | NEW |