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/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
8 #include "chrome/browser/chrome_notification_types.h" | 8 #include "chrome/browser/chrome_notification_types.h" |
9 #include "chrome/browser/infobars/infobar_service.h" | 9 #include "chrome/browser/infobars/infobar_service.h" |
10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 ui::PAGE_TRANSITION_TYPED | | 46 ui::PAGE_TRANSITION_TYPED | |
47 ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)); | 47 ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)); |
48 params.disposition = NEW_BACKGROUND_TAB; | 48 params.disposition = NEW_BACKGROUND_TAB; |
49 chrome::Navigate(¶ms); | 49 chrome::Navigate(¶ms); |
50 } | 50 } |
51 | 51 |
52 } // namespace | 52 } // namespace |
53 | 53 |
54 class WebGLInfoBarTest : public InProcessBrowserTest { | 54 class WebGLInfoBarTest : public InProcessBrowserTest { |
55 protected: | 55 protected: |
56 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { | 56 virtual void SetUpInProcessBrowserTestFixture() override { |
57 base::FilePath test_dir; | 57 base::FilePath test_dir; |
58 ASSERT_TRUE(PathService::Get(content::DIR_TEST_DATA, &test_dir)); | 58 ASSERT_TRUE(PathService::Get(content::DIR_TEST_DATA, &test_dir)); |
59 gpu_test_dir_ = test_dir.AppendASCII("gpu"); | 59 gpu_test_dir_ = test_dir.AppendASCII("gpu"); |
60 } | 60 } |
61 base::FilePath gpu_test_dir_; | 61 base::FilePath gpu_test_dir_; |
62 }; | 62 }; |
63 | 63 |
64 // This test is flaky. http://crbug.com/324555 | 64 // This test is flaky. http://crbug.com/324555 |
65 IN_PROC_BROWSER_TEST_F(WebGLInfoBarTest, DISABLED_ContextLossRaisesInfoBar) { | 65 IN_PROC_BROWSER_TEST_F(WebGLInfoBarTest, DISABLED_ContextLossRaisesInfoBar) { |
66 #undef MAYBE_ContextLossRaisesInfoBard | 66 #undef MAYBE_ContextLossRaisesInfoBard |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
140 // The page should reload and another message sent to the | 140 // The page should reload and another message sent to the |
141 // DomAutomationController. | 141 // DomAutomationController. |
142 m.clear(); | 142 m.clear(); |
143 ASSERT_TRUE(message_queue.WaitForMessage(&m)); | 143 ASSERT_TRUE(message_queue.WaitForMessage(&m)); |
144 EXPECT_EQ("\"LOADED\"", m); | 144 EXPECT_EQ("\"LOADED\"", m); |
145 } | 145 } |
146 | 146 |
147 // There isn't any point in adding a test which calls Accept() on the | 147 // There isn't any point in adding a test which calls Accept() on the |
148 // ThreeDAPIInfoBarDelegate; doing so doesn't remove the infobar, and | 148 // ThreeDAPIInfoBarDelegate; doing so doesn't remove the infobar, and |
149 // there's no concrete event that could be observed in response. | 149 // there's no concrete event that could be observed in response. |
OLD | NEW |