Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(183)

Side by Side Diff: chrome/browser/extensions/api/context_menu/context_menu_apitest.cc

Issue 10375021: Move Extension into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Take 2 Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 } 18 }
19 19
20 // crbug.com/51436 -- creating context menus from multiple script contexts 20 // crbug.com/51436 -- creating context menus from multiple script contexts
21 // should work. 21 // should work.
22 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContextMenusFromMultipleContexts) { 22 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContextMenusFromMultipleContexts) {
23 ASSERT_TRUE(test_server()->Start()); 23 ASSERT_TRUE(test_server()->Start());
24 ASSERT_TRUE(RunExtensionTest("context_menus/add_from_multiple_contexts")) 24 ASSERT_TRUE(RunExtensionTest("context_menus/add_from_multiple_contexts"))
25 << message_; 25 << message_;
26 const Extension* extension = GetSingleLoadedExtension(); 26 const extensions::Extension* extension = GetSingleLoadedExtension();
27 ASSERT_TRUE(extension) << message_; 27 ASSERT_TRUE(extension) << message_;
28 28
29 { 29 {
30 // Tell the extension to update the page action state. 30 // Tell the extension to update the page action state.
31 ResultCatcher catcher; 31 ResultCatcher catcher;
32 ui_test_utils::NavigateToURL(browser(), 32 ui_test_utils::NavigateToURL(browser(),
33 extension->GetResourceURL("popup.html")); 33 extension->GetResourceURL("popup.html"));
34 ASSERT_TRUE(catcher.GetNextResult()); 34 ASSERT_TRUE(catcher.GetNextResult());
35 } 35 }
36 36
37 { 37 {
38 // Tell the extension to update the page action state again. 38 // Tell the extension to update the page action state again.
39 ResultCatcher catcher; 39 ResultCatcher catcher;
40 ui_test_utils::NavigateToURL(browser(), 40 ui_test_utils::NavigateToURL(browser(),
41 extension->GetResourceURL("popup2.html")); 41 extension->GetResourceURL("popup2.html"));
42 ASSERT_TRUE(catcher.GetNextResult()); 42 ASSERT_TRUE(catcher.GetNextResult());
43 } 43 }
44 } 44 }
45 45
46 } // namespace extensions 46 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698