| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/auto_reset.h" | 5 #include "base/auto_reset.h" |
| 6 #include "base/macros.h" | 6 #include "base/macros.h" |
| 7 #include "chrome/browser/ui/extensions/extension_message_bubble_browsertest.h" | 7 #include "chrome/browser/ui/extensions/extension_message_bubble_browsertest.h" |
| 8 #include "chrome/browser/ui/test/test_browser_dialog.h" | 8 #include "chrome/browser/ui/test/test_browser_dialog.h" |
| 9 #include "chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.h" | 9 #include "chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.h" |
| 10 #include "ui/base/ui_base_switches.h" | 10 #include "ui/base/ui_base_switches.h" |
| (...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 TestControlledStartupNotShownOnRestart(); | 218 TestControlledStartupNotShownOnRestart(); |
| 219 } | 219 } |
| 220 | 220 |
| 221 #endif // defined(OS_WIN) | 221 #endif // defined(OS_WIN) |
| 222 | 222 |
| 223 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest, | 223 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest, |
| 224 TestBubbleWithMultipleWindows) { | 224 TestBubbleWithMultipleWindows) { |
| 225 TestBubbleWithMultipleWindows(); | 225 TestBubbleWithMultipleWindows(); |
| 226 } | 226 } |
| 227 | 227 |
| 228 // Crashes on Mac only. http://crbug.com/702554 |
| 229 #if defined(OS_MACOSX) |
| 230 #define MAYBE_TestClickingLearnMoreButton DISABLED_TestClickingLearnMoreButton |
| 231 #else |
| 232 #define MAYBE_TestClickingLearnMoreButton TestClickingLearnMoreButton |
| 233 #endif |
| 228 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest, | 234 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest, |
| 229 TestClickingLearnMoreButton) { | 235 MAYBE_TestClickingLearnMoreButton) { |
| 230 TestClickingLearnMoreButton(); | 236 TestClickingLearnMoreButton(); |
| 231 } | 237 } |
| 232 | 238 |
| 233 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest, | 239 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest, |
| 234 TestClickingActionButton) { | 240 TestClickingActionButton) { |
| 235 TestClickingActionButton(); | 241 TestClickingActionButton(); |
| 236 } | 242 } |
| 237 | 243 |
| 238 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest, | 244 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest, |
| 239 TestClickingDismissButton) { | 245 TestClickingDismissButton) { |
| 240 TestClickingDismissButton(); | 246 TestClickingDismissButton(); |
| 241 } | 247 } |
| 242 | 248 |
| 243 // BrowserDialogTest for the warning bubble that appears at startup when there | 249 // BrowserDialogTest for the warning bubble that appears at startup when there |
| 244 // are extensions installed in developer mode. Can be invoked interactively with | 250 // are extensions installed in developer mode. Can be invoked interactively with |
| 245 // --gtest_filter=BrowserDialogTest.Invoke. | 251 // --gtest_filter=BrowserDialogTest.Invoke. |
| 246 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest, | 252 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest, |
| 247 InvokeDialog_devmode_warning) { | 253 InvokeDialog_devmode_warning) { |
| 248 RunDialog(); | 254 RunDialog(); |
| 249 } | 255 } |
| OLD | NEW |