OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/process_util.h" | 5 #include "base/process_util.h" |
6 #include "chrome/browser/browser_process.h" | 6 #include "chrome/browser/browser_process.h" |
7 #include "chrome/browser/extensions/extension_browsertest.h" | 7 #include "chrome/browser/extensions/extension_browsertest.h" |
8 #include "chrome/browser/extensions/extension_host.h" | 8 #include "chrome/browser/extensions/extension_host.h" |
9 #include "chrome/browser/extensions/extension_process_manager.h" | 9 #include "chrome/browser/extensions/extension_process_manager.h" |
10 #include "chrome/browser/extensions/extension_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
11 #include "chrome/browser/notifications/balloon_host.h" | 11 #include "chrome/browser/notifications/balloon_host.h" |
12 #include "chrome/browser/notifications/notification.h" | 12 #include "chrome/browser/notifications/notification.h" |
13 #include "chrome/browser/notifications/notification_delegate.h" | 13 #include "chrome/browser/notifications/notification_delegate.h" |
14 #include "chrome/browser/notifications/notification_ui_manager.h" | 14 #include "chrome/browser/notifications/notification_ui_manager.h" |
15 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
16 #include "chrome/browser/tabs/tab_strip_model.h" | 16 #include "chrome/browser/tabs/tab_strip_model.h" |
17 #include "chrome/browser/ui/browser.h" | 17 #include "chrome/browser/ui/browser.h" |
18 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 18 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
19 #include "chrome/test/base/ui_test_utils.h" | 19 #include "chrome/test/base/ui_test_utils.h" |
20 #include "content/browser/renderer_host/render_process_host.h" | |
21 #include "content/browser/renderer_host/render_view_host.h" | 20 #include "content/browser/renderer_host/render_view_host.h" |
22 #include "content/browser/tab_contents/tab_contents.h" | 21 #include "content/browser/tab_contents/tab_contents.h" |
| 22 #include "content/public/browser/render_process_host.h" |
23 #include "content/public/common/result_codes.h" | 23 #include "content/public/common/result_codes.h" |
24 | 24 |
25 class ExtensionCrashRecoveryTest : public ExtensionBrowserTest { | 25 class ExtensionCrashRecoveryTest : public ExtensionBrowserTest { |
26 protected: | 26 protected: |
27 ExtensionService* GetExtensionService() { | 27 ExtensionService* GetExtensionService() { |
28 return browser()->profile()->GetExtensionService(); | 28 return browser()->profile()->GetExtensionService(); |
29 } | 29 } |
30 | 30 |
31 ExtensionProcessManager* GetExtensionProcessManager() { | 31 ExtensionProcessManager* GetExtensionProcessManager() { |
32 return browser()->profile()->GetExtensionProcessManager(); | 32 return browser()->profile()->GetExtensionProcessManager(); |
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
486 content::NOTIFICATION_LOAD_STOP, | 486 content::NOTIFICATION_LOAD_STOP, |
487 content::Source<NavigationController>( | 487 content::Source<NavigationController>( |
488 &browser()->GetSelectedTabContentsWrapper()->controller())); | 488 &browser()->GetSelectedTabContentsWrapper()->controller())); |
489 browser()->Reload(CURRENT_TAB); | 489 browser()->Reload(CURRENT_TAB); |
490 observer.Wait(); | 490 observer.Wait(); |
491 } | 491 } |
492 // Extension should now be loaded. | 492 // Extension should now be loaded. |
493 ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size()); | 493 ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size()); |
494 ASSERT_EQ(0U, CountBalloons()); | 494 ASSERT_EQ(0U, CountBalloons()); |
495 } | 495 } |
OLD | NEW |