| 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/api/system_indicator/system_indicator_manage
r.h" | 5 #include "chrome/browser/extensions/api/system_indicator/system_indicator_manage
r.h" |
| 6 #include "chrome/browser/extensions/api/system_indicator/system_indicator_manage
r_factory.h" | 6 #include "chrome/browser/extensions/api/system_indicator/system_indicator_manage
r_factory.h" |
| 7 #include "chrome/browser/extensions/extension_action.h" | 7 #include "chrome/browser/extensions/extension_action.h" |
| 8 #include "chrome/browser/extensions/extension_action_manager.h" | 8 #include "chrome/browser/extensions/extension_action_manager.h" |
| 9 #include "chrome/browser/extensions/extension_apitest.h" | 9 #include "chrome/browser/extensions/extension_apitest.h" |
| 10 #include "chrome/browser/extensions/lazy_background_page_test_util.h" | 10 #include "chrome/browser/extensions/lazy_background_page_test_util.h" |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, SystemIndicator) { | 37 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, SystemIndicator) { |
| 38 // Only run this test on supported platforms. SystemIndicatorManagerFactory | 38 // Only run this test on supported platforms. SystemIndicatorManagerFactory |
| 39 // returns NULL on unsupported platforms. | 39 // returns NULL on unsupported platforms. |
| 40 extensions::SystemIndicatorManager* manager = | 40 extensions::SystemIndicatorManager* manager = |
| 41 extensions::SystemIndicatorManagerFactory::GetForProfile(profile()); | 41 extensions::SystemIndicatorManagerFactory::GetForProfile(profile()); |
| 42 if (manager) { | 42 if (manager) { |
| 43 ASSERT_TRUE(RunExtensionTest("system_indicator/basics")) << message_; | 43 ASSERT_TRUE(RunExtensionTest("system_indicator/basics")) << message_; |
| 44 } | 44 } |
| 45 } | 45 } |
| 46 | 46 |
| 47 IN_PROC_BROWSER_TEST_F(SystemIndicatorApiTest, SystemIndicator) { | 47 IN_PROC_BROWSER_TEST_F(SystemIndicatorApiTest, FLAKY_SystemIndicator) { |
| 48 // Only run this test on supported platforms. SystemIndicatorManagerFactory | 48 // Only run this test on supported platforms. SystemIndicatorManagerFactory |
| 49 // returns NULL on unsupported platforms. | 49 // returns NULL on unsupported platforms. |
| 50 extensions::SystemIndicatorManager* manager = | 50 extensions::SystemIndicatorManager* manager = |
| 51 extensions::SystemIndicatorManagerFactory::GetForProfile(profile()); | 51 extensions::SystemIndicatorManagerFactory::GetForProfile(profile()); |
| 52 if (manager) { | 52 if (manager) { |
| 53 extensions::ResultCatcher catcher; | 53 extensions::ResultCatcher catcher; |
| 54 | 54 |
| 55 const extensions::Extension* extension = | 55 const extensions::Extension* extension = |
| 56 LoadExtensionAndWait("system_indicator/unloaded"); | 56 LoadExtensionAndWait("system_indicator/unloaded"); |
| 57 ASSERT_TRUE(extension) << message_; | 57 ASSERT_TRUE(extension) << message_; |
| 58 | 58 |
| 59 // Lazy Background Page has been shut down. | 59 // Lazy Background Page has been shut down. |
| 60 extensions::ProcessManager* pm = extensions::ProcessManager::Get(profile()); | 60 extensions::ProcessManager* pm = extensions::ProcessManager::Get(profile()); |
| 61 EXPECT_FALSE(pm->GetBackgroundHostForExtension(last_loaded_extension_id())); | 61 EXPECT_FALSE(pm->GetBackgroundHostForExtension(last_loaded_extension_id())); |
| 62 | 62 |
| 63 EXPECT_TRUE(manager->SendClickEventToExtensionForTest(extension->id())); | 63 EXPECT_TRUE(manager->SendClickEventToExtensionForTest(extension->id())); |
| 64 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); | 64 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
| 65 } | 65 } |
| 66 } | 66 } |
| OLD | NEW |