| 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" |
| 11 #include "chrome/browser/ui/browser_commands.h" | 11 #include "chrome/browser/ui/browser_commands.h" |
| 12 #include "chrome/browser/ui/browser_navigator.h" | 12 #include "chrome/browser/ui/browser_navigator.h" |
| 13 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 13 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 14 #include "chrome/common/chrome_paths.h" | 14 #include "chrome/common/chrome_paths.h" |
| 15 #include "chrome/common/chrome_switches.h" | 15 #include "chrome/common/chrome_switches.h" |
| 16 #include "chrome/common/url_constants.h" | 16 #include "chrome/common/url_constants.h" |
| 17 #include "chrome/grit/theme_resources.h" | |
| 18 #include "chrome/test/base/in_process_browser_test.h" | 17 #include "chrome/test/base/in_process_browser_test.h" |
| 19 #include "chrome/test/base/test_launcher_utils.h" | 18 #include "chrome/test/base/test_launcher_utils.h" |
| 20 #include "chrome/test/base/test_switches.h" | 19 #include "chrome/test/base/test_switches.h" |
| 21 #include "chrome/test/base/ui_test_utils.h" | 20 #include "chrome/test/base/ui_test_utils.h" |
| 22 #include "components/infobars/core/confirm_infobar_delegate.h" | 21 #include "components/infobars/core/confirm_infobar_delegate.h" |
| 23 #include "components/infobars/core/infobar.h" | 22 #include "components/infobars/core/infobar.h" |
| 24 #include "content/public/browser/gpu_data_manager.h" | 23 #include "content/public/browser/gpu_data_manager.h" |
| 25 #include "content/public/browser/notification_service.h" | 24 #include "content/public/browser/notification_service.h" |
| 26 #include "content/public/browser/notification_types.h" | 25 #include "content/public/browser/notification_types.h" |
| 27 #include "content/public/common/content_paths.h" | 26 #include "content/public/common/content_paths.h" |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 content::WindowedNotificationObserver infobar_added( | 128 content::WindowedNotificationObserver infobar_added( |
| 130 chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED, | 129 chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED, |
| 131 content::NotificationService::AllSources()); | 130 content::NotificationService::AllSources()); |
| 132 SimulateGPUCrash(browser()); | 131 SimulateGPUCrash(browser()); |
| 133 infobar_added.Wait(); | 132 infobar_added.Wait(); |
| 134 InfoBarService* infobar_service = InfoBarService::FromWebContents( | 133 InfoBarService* infobar_service = InfoBarService::FromWebContents( |
| 135 browser()->tab_strip_model()->GetActiveWebContents()); | 134 browser()->tab_strip_model()->GetActiveWebContents()); |
| 136 ASSERT_EQ(1u, infobar_service->infobar_count()); | 135 ASSERT_EQ(1u, infobar_service->infobar_count()); |
| 137 infobars::InfoBarDelegate* delegate = | 136 infobars::InfoBarDelegate* delegate = |
| 138 infobar_service->infobar_at(0)->delegate(); | 137 infobar_service->infobar_at(0)->delegate(); |
| 139 ASSERT_EQ(IDR_INFOBAR_3D_BLOCKED, delegate->GetIconID()); | 138 ASSERT_TRUE(delegate->AsThreeDAPIInfoBarDelegate()); |
| 140 delegate->AsConfirmInfoBarDelegate()->Cancel(); | 139 delegate->AsConfirmInfoBarDelegate()->Cancel(); |
| 141 | 140 |
| 142 // The page should reload and another message sent to the | 141 // The page should reload and another message sent to the |
| 143 // DomAutomationController. | 142 // DomAutomationController. |
| 144 m.clear(); | 143 m.clear(); |
| 145 ASSERT_TRUE(message_queue.WaitForMessage(&m)); | 144 ASSERT_TRUE(message_queue.WaitForMessage(&m)); |
| 146 EXPECT_EQ("\"LOADED\"", m); | 145 EXPECT_EQ("\"LOADED\"", m); |
| 147 } | 146 } |
| 148 | 147 |
| 149 // 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 |
| 150 // ThreeDAPIInfoBarDelegate; doing so doesn't remove the infobar, and | 149 // ThreeDAPIInfoBarDelegate; doing so doesn't remove the infobar, and |
| 151 // 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 |