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/browser_process.h" | 5 #include "chrome/browser/browser_process.h" |
6 #include "chrome/browser/extensions/extension_browsertest.h" | 6 #include "chrome/browser/extensions/extension_browsertest.h" |
7 #include "chrome/browser/extensions/extension_host.h" | 7 #include "chrome/browser/extensions/extension_host.h" |
8 #include "chrome/browser/extensions/extension_service.h" | 8 #include "chrome/browser/extensions/extension_service.h" |
9 #include "chrome/browser/extensions/extension_system.h" | |
10 #include "chrome/browser/notifications/balloon.h" | 9 #include "chrome/browser/notifications/balloon.h" |
11 #include "chrome/browser/notifications/balloon_collection.h" | 10 #include "chrome/browser/notifications/balloon_collection.h" |
12 #include "chrome/browser/notifications/balloon_host.h" | 11 #include "chrome/browser/notifications/balloon_host.h" |
13 #include "chrome/browser/notifications/notification.h" | 12 #include "chrome/browser/notifications/notification.h" |
14 #include "chrome/browser/notifications/notification_delegate.h" | 13 #include "chrome/browser/notifications/notification_delegate.h" |
15 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
16 #include "chrome/browser/ui/browser.h" | 15 #include "chrome/browser/ui/browser.h" |
17 #include "chrome/browser/ui/browser_commands.h" | 16 #include "chrome/browser/ui/browser_commands.h" |
18 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 17 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
19 #include "chrome/test/base/ui_test_utils.h" | 18 #include "chrome/test/base/ui_test_utils.h" |
20 #include "content/public/browser/navigation_controller.h" | 19 #include "content/public/browser/navigation_controller.h" |
21 #include "content/public/browser/render_process_host.h" | 20 #include "content/public/browser/render_process_host.h" |
22 #include "content/public/browser/render_view_host.h" | 21 #include "content/public/browser/render_view_host.h" |
23 #include "content/public/browser/web_contents.h" | 22 #include "content/public/browser/web_contents.h" |
24 #include "content/public/common/result_codes.h" | 23 #include "content/public/common/result_codes.h" |
25 #include "extensions/browser/extension_registry.h" | 24 #include "extensions/browser/extension_registry.h" |
| 25 #include "extensions/browser/extension_system.h" |
26 #include "extensions/browser/process_manager.h" | 26 #include "extensions/browser/process_manager.h" |
27 #include "extensions/browser/process_map.h" | 27 #include "extensions/browser/process_map.h" |
28 #include "ui/message_center/message_center.h" | 28 #include "ui/message_center/message_center.h" |
29 #include "ui/message_center/message_center_switches.h" | 29 #include "ui/message_center/message_center_switches.h" |
30 #include "ui/message_center/message_center_util.h" | 30 #include "ui/message_center/message_center_util.h" |
31 #include "ui/message_center/notification_list.h" | 31 #include "ui/message_center/notification_list.h" |
32 | 32 |
33 #if defined(OS_CHROMEOS) | 33 #if defined(OS_CHROMEOS) |
34 #include "chrome/browser/notifications/notification_ui_manager.h" | 34 #include "chrome/browser/notifications/notification_ui_manager.h" |
35 #else | 35 #else |
(...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
593 GetController())); | 593 GetController())); |
594 chrome::Reload(browser(), CURRENT_TAB); | 594 chrome::Reload(browser(), CURRENT_TAB); |
595 observer.Wait(); | 595 observer.Wait(); |
596 } | 596 } |
597 // Extension should now be loaded. | 597 // Extension should now be loaded. |
598 SCOPED_TRACE("after reloading the tab"); | 598 SCOPED_TRACE("after reloading the tab"); |
599 CheckExtensionConsistency(first_extension_id_); | 599 CheckExtensionConsistency(first_extension_id_); |
600 ASSERT_EQ(count_before + 1, GetEnabledExtensionCount()); | 600 ASSERT_EQ(count_before + 1, GetEnabledExtensionCount()); |
601 ASSERT_EQ(0U, CountBalloons()); | 601 ASSERT_EQ(0U, CountBalloons()); |
602 } | 602 } |
OLD | NEW |