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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
82 gpu_test_dir_.AppendASCII("webgl.html"), "query=kill")); | 83 gpu_test_dir_.AppendASCII("webgl.html"), "query=kill")); |
83 observer.Wait(); | 84 observer.Wait(); |
84 | 85 |
85 content::WindowedNotificationObserver infobar_added( | 86 content::WindowedNotificationObserver infobar_added( |
86 chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED, | 87 chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED, |
87 content::NotificationService::AllSources()); | 88 content::NotificationService::AllSources()); |
88 SimulateGPUCrash(browser()); | 89 SimulateGPUCrash(browser()); |
89 infobar_added.Wait(); | 90 infobar_added.Wait(); |
90 EXPECT_EQ(1u, | 91 EXPECT_EQ(1u, |
91 InfoBarService::FromWebContents( | 92 InfoBarService::FromWebContents( |
92 browser()->tab_strip_model()->GetActiveWebContents())-> | 93 browser()->tab_strip_model()->GetActiveWebContents()) |
93 infobar_count()); | 94 ->infobar_manager().infobar_count()); |
94 } | 95 } |
95 | 96 |
96 // This test is flaky. http://crbug.com/324555 | 97 // This test is flaky. http://crbug.com/324555 |
97 IN_PROC_BROWSER_TEST_F(WebGLInfoBarTest, DISABLED_ContextLossInfoBarReload) { | 98 IN_PROC_BROWSER_TEST_F(WebGLInfoBarTest, DISABLED_ContextLossInfoBarReload) { |
98 #if defined(OS_WIN) && defined(USE_ASH) | 99 #if defined(OS_WIN) && defined(USE_ASH) |
99 // Disable this test in Metro+Ash for now (http://crbug.com/262796). | 100 // Disable this test in Metro+Ash for now (http://crbug.com/262796). |
100 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) | 101 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) |
101 return; | 102 return; |
102 #endif | 103 #endif |
103 | 104 |
(...skipping 19 matching lines...) Expand all Loading... |
123 | 124 |
124 message_queue.ClearQueue(); | 125 message_queue.ClearQueue(); |
125 | 126 |
126 content::WindowedNotificationObserver infobar_added( | 127 content::WindowedNotificationObserver infobar_added( |
127 chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED, | 128 chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED, |
128 content::NotificationService::AllSources()); | 129 content::NotificationService::AllSources()); |
129 SimulateGPUCrash(browser()); | 130 SimulateGPUCrash(browser()); |
130 infobar_added.Wait(); | 131 infobar_added.Wait(); |
131 InfoBarService* infobar_service = InfoBarService::FromWebContents( | 132 InfoBarService* infobar_service = InfoBarService::FromWebContents( |
132 browser()->tab_strip_model()->GetActiveWebContents()); | 133 browser()->tab_strip_model()->GetActiveWebContents()); |
133 ASSERT_EQ(1u, infobar_service->infobar_count()); | 134 ASSERT_EQ(1u, infobar_service->infobar_manager().infobar_count()); |
134 InfoBarDelegate* delegate = infobar_service->infobar_at(0)->delegate(); | 135 InfoBarDelegate* delegate = |
| 136 infobar_service->infobar_manager().infobar_at(0)->delegate(); |
135 ASSERT_TRUE(delegate->AsThreeDAPIInfoBarDelegate()); | 137 ASSERT_TRUE(delegate->AsThreeDAPIInfoBarDelegate()); |
136 delegate->AsConfirmInfoBarDelegate()->Cancel(); | 138 delegate->AsConfirmInfoBarDelegate()->Cancel(); |
137 | 139 |
138 // The page should reload and another message sent to the | 140 // The page should reload and another message sent to the |
139 // DomAutomationController. | 141 // DomAutomationController. |
140 m.clear(); | 142 m.clear(); |
141 ASSERT_TRUE(message_queue.WaitForMessage(&m)); | 143 ASSERT_TRUE(message_queue.WaitForMessage(&m)); |
142 EXPECT_EQ("\"LOADED\"", m); | 144 EXPECT_EQ("\"LOADED\"", m); |
143 } | 145 } |
144 | 146 |
145 // 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 |
146 // ThreeDAPIInfoBarDelegate; doing so doesn't remove the infobar, and | 148 // ThreeDAPIInfoBarDelegate; doing so doesn't remove the infobar, and |
147 // 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 |