2 files changed, 6 insertions, 10 deletions
diff --git a/chrome/browser/extensions/extension_context_menu_api.h b/chrome/browser/extensions/extension_context_menu_api.h
index 3362aae..bfd0d12 100644
--- a/chrome/browser/extensions/extension_context_menu_api.h
+++ b/chrome/browser/extensions/extension_context_menu_api.h
@@ -46,25 +46,25 @@ class ExtensionContextMenuFunction : public SyncExtensionFunction {
 class CreateContextMenuFunction : public ExtensionContextMenuFunction {
   ~CreateContextMenuFunction() {}
   virtual bool RunImpl();
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.contextMenus.create")
+  DECLARE_EXTENSION_FUNCTION_NAME("contextMenus.create")
 };
 
 class UpdateContextMenuFunction : public ExtensionContextMenuFunction {
   ~UpdateContextMenuFunction() {}
   virtual bool RunImpl();
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.contextMenus.update")
+  DECLARE_EXTENSION_FUNCTION_NAME("contextMenus.update")
 };
 
 class RemoveContextMenuFunction : public ExtensionContextMenuFunction {
   ~RemoveContextMenuFunction() {}
   virtual bool RunImpl();
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.contextMenus.remove")
+  DECLARE_EXTENSION_FUNCTION_NAME("contextMenus.remove")
 };
 
 class RemoveAllContextMenusFunction : public ExtensionContextMenuFunction {
   ~RemoveAllContextMenusFunction() {}
   virtual bool RunImpl();
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.contextMenus.removeAll")
+  DECLARE_EXTENSION_FUNCTION_NAME("contextMenus.removeAll")
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_CONTEXT_MENU_API_H__
diff --git a/chrome/browser/extensions/extension_context_menu_apitest.cc b/chrome/browser/extensions/extension_context_menu_apitest.cc
index ac8b114..1ae6edf 100644
--- a/chrome/browser/extensions/extension_context_menu_apitest.cc
+++ b/chrome/browser/extensions/extension_context_menu_apitest.cc
@@ -7,10 +7,6 @@
 #include "chrome/common/chrome_switches.h"
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContextMenus) {
-  // TODO(asargent): Remove when context menu API is no longer experimental
-  // (http://crbug.com/39508).
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnableExperimentalExtensionApis);
-
-  ASSERT_TRUE(RunExtensionTest("context_menus")) << message_;
+  ASSERT_TRUE(RunExtensionTest("context_menus/basics")) << message_;
+  ASSERT_TRUE(RunExtensionTest("context_menus/no_perms")) << message_;
 }