| 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_action.h" | 5 #include "chrome/browser/extensions/extension_action.h" |
| 6 #include "chrome/browser/extensions/extension_apitest.h" | 6 #include "chrome/browser/extensions/extension_apitest.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/test/base/ui_test_utils.h" | 10 #include "chrome/test/base/ui_test_utils.h" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_ContextMenus) { | 21 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_ContextMenus) { |
| 22 ASSERT_TRUE(RunExtensionTest("context_menus/basics")) << message_; | 22 ASSERT_TRUE(RunExtensionTest("context_menus/basics")) << message_; |
| 23 ASSERT_TRUE(RunExtensionTest("context_menus/no_perms")) << message_; | 23 ASSERT_TRUE(RunExtensionTest("context_menus/no_perms")) << message_; |
| 24 ASSERT_TRUE(RunExtensionTest("context_menus/item_ids")) << message_; | 24 ASSERT_TRUE(RunExtensionTest("context_menus/item_ids")) << message_; |
| 25 ASSERT_TRUE(RunExtensionTest("context_menus/event_page")) << message_; | 25 ASSERT_TRUE(RunExtensionTest("context_menus/event_page")) << message_; |
| 26 } | 26 } |
| 27 | 27 |
| 28 // crbug.com/51436 -- creating context menus from multiple script contexts | 28 // crbug.com/51436 -- creating context menus from multiple script contexts |
| 29 // should work. | 29 // should work. |
| 30 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContextMenusFromMultipleContexts) { | 30 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContextMenusFromMultipleContexts) { |
| 31 ASSERT_TRUE(test_server()->Start()); | 31 ASSERT_TRUE(embedded_test_server()->Start()); |
| 32 ASSERT_TRUE(RunExtensionTest("context_menus/add_from_multiple_contexts")) | 32 ASSERT_TRUE(RunExtensionTest("context_menus/add_from_multiple_contexts")) |
| 33 << message_; | 33 << message_; |
| 34 const extensions::Extension* extension = GetSingleLoadedExtension(); | 34 const extensions::Extension* extension = GetSingleLoadedExtension(); |
| 35 ASSERT_TRUE(extension) << message_; | 35 ASSERT_TRUE(extension) << message_; |
| 36 | 36 |
| 37 { | 37 { |
| 38 // Tell the extension to update the page action state. | 38 // Tell the extension to update the page action state. |
| 39 ResultCatcher catcher; | 39 ResultCatcher catcher; |
| 40 ui_test_utils::NavigateToURL(browser(), | 40 ui_test_utils::NavigateToURL(browser(), |
| 41 extension->GetResourceURL("popup.html")); | 41 extension->GetResourceURL("popup.html")); |
| 42 ASSERT_TRUE(catcher.GetNextResult()); | 42 ASSERT_TRUE(catcher.GetNextResult()); |
| 43 } | 43 } |
| 44 | 44 |
| 45 { | 45 { |
| 46 // Tell the extension to update the page action state again. | 46 // Tell the extension to update the page action state again. |
| 47 ResultCatcher catcher; | 47 ResultCatcher catcher; |
| 48 ui_test_utils::NavigateToURL(browser(), | 48 ui_test_utils::NavigateToURL(browser(), |
| 49 extension->GetResourceURL("popup2.html")); | 49 extension->GetResourceURL("popup2.html")); |
| 50 ASSERT_TRUE(catcher.GetNextResult()); | 50 ASSERT_TRUE(catcher.GetNextResult()); |
| 51 } | 51 } |
| 52 } | 52 } |
| 53 | 53 |
| 54 } // namespace extensions | 54 } // namespace extensions |
| OLD | NEW |