Enable devtools via context menu in platform apps and popup extensions.

chrome/browser/extensions/platform_app_browsertest.cc

Index: chrome/browser/extensions/platform_app_browsertest.cc
diff --git a/chrome/browser/extensions/platform_app_browsertest.cc b/chrome/browser/extensions/platform_app_browsertest.cc
index abde2eedc0e880594e1b4738ff8b590bbd7cf26c..3987e3a20c4dd2f9048a36b556cb1546d52b4543 100644
--- a/chrome/browser/extensions/platform_app_browsertest.cc
+++ b/chrome/browser/extensions/platform_app_browsertest.cc
@@ -141,7 +141,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_EmptyContextMenu) {
   LoadAndLaunchPlatformApp("empty");
 
   // The empty app doesn't add any context menu items, so its menu should
-  // be empty.
+  // only include the developer tools.
   WebContents* web_contents = GetFirstPlatformAppWebContents();
   ASSERT_TRUE(web_contents);
   WebKit::WebContextMenuData data;
@@ -149,7 +149,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_EmptyContextMenu) {
   PlatformAppContextMenu* menu = new PlatformAppContextMenu(web_contents,
       params);
   menu->Init();
-  ASSERT_FALSE(menu->menu_model().GetItemCount());
+  ASSERT_EQ(1, menu->menu_model().GetItemCount());
 }
 
 // Disabled until shell windows are implemented for non-GTK, non-Views toolkits.
@@ -165,8 +165,8 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_AppWithContextMenu) {
   // Wait for the extension to tell us it's created an item.
   ASSERT_TRUE(listener1.WaitUntilSatisfied());
 
-  // The context_menu app has one context menu item. This is all that should
-  // be in the menu, there should be no seperator.
+  // The context_menu app has one context menu item. This, along with a
+  // separator and the developer tools, is all that should be in the menu.
   WebContents* web_contents = GetFirstPlatformAppWebContents();
   ASSERT_TRUE(web_contents);
   WebKit::WebContextMenuData data;
@@ -174,7 +174,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_AppWithContextMenu) {
   PlatformAppContextMenu* menu = new PlatformAppContextMenu(web_contents,
       params);
   menu->Init();
-  ASSERT_EQ(1, menu->menu_model().GetItemCount());
+  ASSERT_EQ(3, menu->menu_model().GetItemCount());
 }
 
 // Disabled until shell windows are implemented for non-GTK, non-Views toolkits.