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 "chrome/browser/extensions/crx_installer.h" | 5 #include "chrome/browser/extensions/crx_installer.h" |
6 #include "chrome/browser/extensions/extension_install_prompt.h" | 6 #include "chrome/browser/extensions/extension_install_prompt.h" |
7 #include "chrome/browser/extensions/extension_service.h" | 7 #include "chrome/browser/extensions/extension_service.h" |
8 #include "chrome/browser/infobars/infobar_tab_helper.h" | 8 #include "chrome/browser/infobars/infobar_tab_helper.h" |
| 9 #include "chrome/browser/profiles/profile.h" |
9 #include "chrome/browser/themes/theme_service.h" | 10 #include "chrome/browser/themes/theme_service.h" |
10 #include "chrome/browser/themes/theme_service_factory.h" | 11 #include "chrome/browser/themes/theme_service_factory.h" |
11 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
12 #include "chrome/browser/ui/browser_tabstrip.h" | 13 #include "chrome/browser/ui/browser_tabstrip.h" |
13 #include "chrome/browser/ui/tab_contents/tab_contents.h" | 14 #include "chrome/browser/ui/tab_contents/tab_contents.h" |
14 #include "chrome/common/chrome_notification_types.h" | 15 #include "chrome/common/chrome_notification_types.h" |
15 #include "chrome/common/chrome_switches.h" | 16 #include "chrome/common/chrome_switches.h" |
16 #include "chrome/browser/profiles/profile.h" | |
17 #include "content/public/browser/notification_service.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/ui_test_utils.h" | 18 #include "chrome/test/base/ui_test_utils.h" |
20 #include "chrome/test/ui/ui_test.h" | 19 #include "chrome/test/ui/ui_test.h" |
| 20 #include "content/public/browser/notification_service.h" |
21 #include "net/test/test_server.h" | 21 #include "net/test/test_server.h" |
22 | 22 |
23 class InfoBarsTest : public InProcessBrowserTest { | 23 class InfoBarsTest : public InProcessBrowserTest { |
24 public: | 24 public: |
25 InfoBarsTest() {} | 25 InfoBarsTest() {} |
26 | 26 |
27 void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 27 void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
28 command_line->AppendSwitchASCII( | 28 command_line->AppendSwitchASCII( |
29 switches::kAppsGalleryInstallAutoConfirmForTests, "accept"); | 29 switches::kAppsGalleryInstallAutoConfirmForTests, "accept"); |
30 } | 30 } |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 | 80 |
81 content::WindowedNotificationObserver infobar_removed_2( | 81 content::WindowedNotificationObserver infobar_removed_2( |
82 chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED, | 82 chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED, |
83 content::NotificationService::AllSources()); | 83 content::NotificationService::AllSources()); |
84 ThemeServiceFactory::GetForProfile(browser()->profile())->UseDefaultTheme(); | 84 ThemeServiceFactory::GetForProfile(browser()->profile())->UseDefaultTheme(); |
85 infobar_removed_2.Wait(); | 85 infobar_removed_2.Wait(); |
86 EXPECT_EQ(0u, | 86 EXPECT_EQ(0u, |
87 chrome::GetActiveTabContents(browser())->infobar_tab_helper()-> | 87 chrome::GetActiveTabContents(browser())->infobar_tab_helper()-> |
88 infobar_count()); | 88 infobar_count()); |
89 } | 89 } |
OLD | NEW |