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 "build/build_config.h" |
6 #include "chrome/browser/chrome_notification_types.h" | 7 #include "chrome/browser/chrome_notification_types.h" |
7 #include "chrome/browser/extensions/crx_installer.h" | 8 #include "chrome/browser/extensions/crx_installer.h" |
8 #include "chrome/browser/extensions/extension_install_prompt.h" | 9 #include "chrome/browser/extensions/extension_install_prompt.h" |
9 #include "chrome/browser/extensions/extension_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
10 #include "chrome/browser/infobars/infobar_service.h" | 11 #include "chrome/browser/infobars/infobar_service.h" |
11 #include "chrome/browser/profiles/profile.h" | 12 #include "chrome/browser/profiles/profile.h" |
12 #include "chrome/browser/themes/theme_service.h" | 13 #include "chrome/browser/themes/theme_service.h" |
13 #include "chrome/browser/themes/theme_service_factory.h" | 14 #include "chrome/browser/themes/theme_service_factory.h" |
14 #include "chrome/browser/ui/browser.h" | 15 #include "chrome/browser/ui/browser.h" |
15 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 16 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
91 content::WindowedNotificationObserver infobar_removed_2( | 92 content::WindowedNotificationObserver infobar_removed_2( |
92 chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED, | 93 chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED, |
93 content::NotificationService::AllSources()); | 94 content::NotificationService::AllSources()); |
94 ThemeServiceFactory::GetForProfile(browser()->profile())->UseDefaultTheme(); | 95 ThemeServiceFactory::GetForProfile(browser()->profile())->UseDefaultTheme(); |
95 infobar_removed_2.Wait(); | 96 infobar_removed_2.Wait(); |
96 EXPECT_EQ(0u, | 97 EXPECT_EQ(0u, |
97 InfoBarService::FromWebContents( | 98 InfoBarService::FromWebContents( |
98 browser()->tab_strip_model()->GetActiveWebContents())-> | 99 browser()->tab_strip_model()->GetActiveWebContents())-> |
99 infobar_count()); | 100 infobar_count()); |
100 } | 101 } |
OLD | NEW |