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/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" |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 std::string second_extension_id_; | 116 std::string second_extension_id_; |
117 | 117 |
118 }; | 118 }; |
119 | 119 |
120 // TODO(rsesek): Implement and enable these tests. http://crbug.com/179904 | 120 // TODO(rsesek): Implement and enable these tests. http://crbug.com/179904 |
121 #if defined(ENABLE_MESSAGE_CENTER) && !defined(OS_MACOSX) | 121 #if defined(ENABLE_MESSAGE_CENTER) && !defined(OS_MACOSX) |
122 | 122 |
123 class MessageCenterExtensionCrashRecoveryTest | 123 class MessageCenterExtensionCrashRecoveryTest |
124 : public ExtensionCrashRecoveryTestBase { | 124 : public ExtensionCrashRecoveryTestBase { |
125 protected: | 125 protected: |
126 virtual void SetUpCommandLine(CommandLine* command_line) { | 126 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
127 ExtensionCrashRecoveryTestBase::SetUpCommandLine(command_line); | 127 ExtensionCrashRecoveryTestBase::SetUpCommandLine(command_line); |
128 command_line->AppendSwitch( | 128 command_line->AppendSwitch( |
129 message_center::switches::kEnableRichNotifications); | 129 message_center::switches::kEnableRichNotifications); |
130 } | 130 } |
131 | 131 |
132 virtual void AcceptNotification(size_t index) OVERRIDE { | 132 virtual void AcceptNotification(size_t index) OVERRIDE { |
133 message_center::MessageCenter* message_center = | 133 message_center::MessageCenter* message_center = |
134 message_center::MessageCenter::Get(); | 134 message_center::MessageCenter::Get(); |
135 ASSERT_GT(message_center->NotificationCount(), index); | 135 ASSERT_GT(message_center->NotificationCount(), index); |
136 message_center::NotificationList::Notifications::reverse_iterator it = | 136 message_center::NotificationList::Notifications::reverse_iterator it = |
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
582 GetController())); | 582 GetController())); |
583 chrome::Reload(browser(), CURRENT_TAB); | 583 chrome::Reload(browser(), CURRENT_TAB); |
584 observer.Wait(); | 584 observer.Wait(); |
585 } | 585 } |
586 // Extension should now be loaded. | 586 // Extension should now be loaded. |
587 SCOPED_TRACE("after reloading the tab"); | 587 SCOPED_TRACE("after reloading the tab"); |
588 CheckExtensionConsistency(first_extension_id_); | 588 CheckExtensionConsistency(first_extension_id_); |
589 ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size()); | 589 ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size()); |
590 ASSERT_EQ(0U, CountBalloons()); | 590 ASSERT_EQ(0U, CountBalloons()); |
591 } | 591 } |
OLD | NEW |