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/confirm_infobar_delegate.h" | 9 #include "chrome/browser/infobars/confirm_infobar_delegate.h" |
10 #include "chrome/browser/infobars/infobar.h" | 10 #include "chrome/browser/infobars/infobar.h" |
| 11 #include "chrome/browser/infobars/infobar_manager.h" |
11 #include "chrome/browser/infobars/infobar_service.h" | 12 #include "chrome/browser/infobars/infobar_service.h" |
12 #include "chrome/browser/ui/browser.h" | 13 #include "chrome/browser/ui/browser.h" |
13 #include "chrome/browser/ui/browser_commands.h" | 14 #include "chrome/browser/ui/browser_commands.h" |
14 #include "chrome/browser/ui/browser_navigator.h" | 15 #include "chrome/browser/ui/browser_navigator.h" |
15 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 16 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
16 #include "chrome/common/chrome_paths.h" | 17 #include "chrome/common/chrome_paths.h" |
17 #include "chrome/common/chrome_switches.h" | 18 #include "chrome/common/chrome_switches.h" |
18 #include "chrome/common/url_constants.h" | 19 #include "chrome/common/url_constants.h" |
19 #include "chrome/test/base/in_process_browser_test.h" | 20 #include "chrome/test/base/in_process_browser_test.h" |
20 #include "chrome/test/base/test_launcher_utils.h" | 21 #include "chrome/test/base/test_launcher_utils.h" |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 gpu_test_dir_.AppendASCII("webgl.html"), "query=kill")); | 84 gpu_test_dir_.AppendASCII("webgl.html"), "query=kill")); |
84 observer.Wait(); | 85 observer.Wait(); |
85 | 86 |
86 content::WindowedNotificationObserver infobar_added( | 87 content::WindowedNotificationObserver infobar_added( |
87 chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED, | 88 chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED, |
88 content::NotificationService::AllSources()); | 89 content::NotificationService::AllSources()); |
89 SimulateGPUCrash(browser()); | 90 SimulateGPUCrash(browser()); |
90 infobar_added.Wait(); | 91 infobar_added.Wait(); |
91 EXPECT_EQ(1u, | 92 EXPECT_EQ(1u, |
92 InfoBarService::FromWebContents( | 93 InfoBarService::FromWebContents( |
93 browser()->tab_strip_model()->GetActiveWebContents())-> | 94 browser()->tab_strip_model()->GetActiveWebContents()) |
94 infobar_count()); | 95 ->infobar_manager()->infobar_count()); |
95 } | 96 } |
96 | 97 |
97 // This test is flaky. http://crbug.com/324555 | 98 // This test is flaky. http://crbug.com/324555 |
98 IN_PROC_BROWSER_TEST_F(WebGLInfoBarTest, DISABLED_ContextLossInfoBarReload) { | 99 IN_PROC_BROWSER_TEST_F(WebGLInfoBarTest, DISABLED_ContextLossInfoBarReload) { |
99 #if defined(OS_WIN) && defined(USE_ASH) | 100 #if defined(OS_WIN) && defined(USE_ASH) |
100 // Disable this test in Metro+Ash for now (http://crbug.com/262796). | 101 // Disable this test in Metro+Ash for now (http://crbug.com/262796). |
101 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) | 102 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) |
102 return; | 103 return; |
103 #endif | 104 #endif |
104 | 105 |
(...skipping 19 matching lines...) Expand all Loading... |
124 | 125 |
125 message_queue.ClearQueue(); | 126 message_queue.ClearQueue(); |
126 | 127 |
127 content::WindowedNotificationObserver infobar_added( | 128 content::WindowedNotificationObserver infobar_added( |
128 chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED, | 129 chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED, |
129 content::NotificationService::AllSources()); | 130 content::NotificationService::AllSources()); |
130 SimulateGPUCrash(browser()); | 131 SimulateGPUCrash(browser()); |
131 infobar_added.Wait(); | 132 infobar_added.Wait(); |
132 InfoBarService* infobar_service = InfoBarService::FromWebContents( | 133 InfoBarService* infobar_service = InfoBarService::FromWebContents( |
133 browser()->tab_strip_model()->GetActiveWebContents()); | 134 browser()->tab_strip_model()->GetActiveWebContents()); |
134 ASSERT_EQ(1u, infobar_service->infobar_count()); | 135 ASSERT_EQ(1u, infobar_service->infobar_manager()->infobar_count()); |
135 InfoBarDelegate* delegate = infobar_service->infobar_at(0)->delegate(); | 136 InfoBarDelegate* delegate = |
| 137 infobar_service->infobar_manager()->infobar_at(0)->delegate(); |
136 ASSERT_EQ(IDR_INFOBAR_3D_BLOCKED, delegate->GetIconID()); | 138 ASSERT_EQ(IDR_INFOBAR_3D_BLOCKED, delegate->GetIconID()); |
137 delegate->AsConfirmInfoBarDelegate()->Cancel(); | 139 delegate->AsConfirmInfoBarDelegate()->Cancel(); |
138 | 140 |
139 // The page should reload and another message sent to the | 141 // The page should reload and another message sent to the |
140 // DomAutomationController. | 142 // DomAutomationController. |
141 m.clear(); | 143 m.clear(); |
142 ASSERT_TRUE(message_queue.WaitForMessage(&m)); | 144 ASSERT_TRUE(message_queue.WaitForMessage(&m)); |
143 EXPECT_EQ("\"LOADED\"", m); | 145 EXPECT_EQ("\"LOADED\"", m); |
144 } | 146 } |
145 | 147 |
146 // There isn't any point in adding a test which calls Accept() on the | 148 // There isn't any point in adding a test which calls Accept() on the |
147 // ThreeDAPIInfoBarDelegate; doing so doesn't remove the infobar, and | 149 // ThreeDAPIInfoBarDelegate; doing so doesn't remove the infobar, and |
148 // there's no concrete event that could be observed in response. | 150 // there's no concrete event that could be observed in response. |
OLD | NEW |