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

chrome/browser/extensions/platform_app_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_host.h"
@@ skipping 123 matching lines @@
 // Disabled until shell windows are implemented for non-GTK, non-Views toolkits.
 #if defined(TOOLKIT_GTK) || defined(TOOLKIT_VIEWS)
 #define MAYBE_EmptyContextMenu EmptyContextMenu
 #else
 #define MAYBE_EmptyContextMenu DISABLED_EmptyContextMenu
 #endif
 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;
   ContextMenuParams params(data);
   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.
 #if defined(TOOLKIT_GTK) || defined(TOOLKIT_VIEWS)
 #define MAYBE_AppWithContextMenu AppWithContextMenu
 #else
 #define MAYBE_AppWithContextMenu DISABLED_AppWithContextMenu
 #endif
 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_AppWithContextMenu) {
   ExtensionTestMessageListener listener1("created item", false);
   LoadAndLaunchPlatformApp("context_menu");
 
   // 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;
   ContextMenuParams params(data);
   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.
 #if defined(TOOLKIT_GTK) || defined(TOOLKIT_VIEWS)
 #define MAYBE_DisallowNavigation DisallowNavigation
 #else
 #define MAYBE_DisallowNavigation DISABLED_DisallowNavigation
 #endif
 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_DisallowNavigation) {
   ASSERT_TRUE(test_server()->Start());
@@ skipping 26 matching lines @@
 // Tests that localStorage and WebSQL are disabled for platform apps.
 // Disabled until shell windows are implemented for non-GTK, non-Views toolkits.
 #if defined(TOOLKIT_GTK) || defined(TOOLKIT_VIEWS)
 #define MAYBE_DisallowStorage DisallowStorage
 #else
 #define MAYBE_DisallowStorage DISABLED_DisallowStorage
 #endif
 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_DisallowStorage) {
   ASSERT_TRUE(RunPlatformAppTest("platform_apps/storage")) << message_;
 }