| 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/extension_apitest.h" | 5 #include "chrome/browser/extensions/extension_apitest.h" |
| 6 #include "chrome/browser/extensions/extension_browser_event_router.h" | 6 #include "chrome/browser/extensions/extension_browser_event_router.h" |
| 7 #include "chrome/browser/extensions/extension_service.h" | 7 #include "chrome/browser/extensions/extension_service.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/common/extensions/extension_action.h" | 10 #include "chrome/common/extensions/extension_action.h" |
| 11 #include "chrome/test/base/ui_test_utils.h" | 11 #include "chrome/test/base/ui_test_utils.h" |
| 12 | 12 |
| 13 namespace extensions { | 13 namespace extensions { |
| 14 | 14 |
| 15 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContextMenus) { | 15 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContextMenus) { |
| 16 ASSERT_TRUE(RunExtensionTest("context_menus/basics")) << message_; | 16 ASSERT_TRUE(RunExtensionTest("context_menus/basics")) << message_; |
| 17 ASSERT_TRUE(RunExtensionTest("context_menus/no_perms")) << message_; | 17 ASSERT_TRUE(RunExtensionTest("context_menus/no_perms")) << message_; |
| 18 ASSERT_TRUE(RunExtensionTest("context_menus/item_ids")) << message_; | 18 ASSERT_TRUE(RunExtensionTest("context_menus/item_ids")) << message_; |
| 19 ASSERT_TRUE(RunExtensionTest("context_menus/event_page_item_ids")) | 19 ASSERT_TRUE(RunExtensionTest("context_menus/event_page")) << message_; |
| 20 << message_; | |
| 21 } | 20 } |
| 22 | 21 |
| 23 // crbug.com/51436 -- creating context menus from multiple script contexts | 22 // crbug.com/51436 -- creating context menus from multiple script contexts |
| 24 // should work. | 23 // should work. |
| 25 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContextMenusFromMultipleContexts) { | 24 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContextMenusFromMultipleContexts) { |
| 26 ASSERT_TRUE(test_server()->Start()); | 25 ASSERT_TRUE(test_server()->Start()); |
| 27 ASSERT_TRUE(RunExtensionTest("context_menus/add_from_multiple_contexts")) | 26 ASSERT_TRUE(RunExtensionTest("context_menus/add_from_multiple_contexts")) |
| 28 << message_; | 27 << message_; |
| 29 const extensions::Extension* extension = GetSingleLoadedExtension(); | 28 const extensions::Extension* extension = GetSingleLoadedExtension(); |
| 30 ASSERT_TRUE(extension) << message_; | 29 ASSERT_TRUE(extension) << message_; |
| 31 | 30 |
| 32 { | 31 { |
| 33 // Tell the extension to update the page action state. | 32 // Tell the extension to update the page action state. |
| 34 ResultCatcher catcher; | 33 ResultCatcher catcher; |
| 35 ui_test_utils::NavigateToURL(browser(), | 34 ui_test_utils::NavigateToURL(browser(), |
| 36 extension->GetResourceURL("popup.html")); | 35 extension->GetResourceURL("popup.html")); |
| 37 ASSERT_TRUE(catcher.GetNextResult()); | 36 ASSERT_TRUE(catcher.GetNextResult()); |
| 38 } | 37 } |
| 39 | 38 |
| 40 { | 39 { |
| 41 // Tell the extension to update the page action state again. | 40 // Tell the extension to update the page action state again. |
| 42 ResultCatcher catcher; | 41 ResultCatcher catcher; |
| 43 ui_test_utils::NavigateToURL(browser(), | 42 ui_test_utils::NavigateToURL(browser(), |
| 44 extension->GetResourceURL("popup2.html")); | 43 extension->GetResourceURL("popup2.html")); |
| 45 ASSERT_TRUE(catcher.GetNextResult()); | 44 ASSERT_TRUE(catcher.GetNextResult()); |
| 46 } | 45 } |
| 47 } | 46 } |
| 48 | 47 |
| 49 } // namespace extensions | 48 } // namespace extensions |
| OLD | NEW |