Re-open DevTools windows for PackagedApps if they are reloaded with DevTools open.

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/bind.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/platform_thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/automation/automation_util.h"
+#include "chrome/browser/debugger/devtools_window.h"
+#include "content/public/browser/devtools_agent_host_registry.h"
 #include "chrome/browser/tab_contents/render_view_context_menu.h"
 #include "chrome/browser/extensions/app_restore_service_factory.h"
 #include "chrome/browser/extensions/app_restore_service.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/extensions/platform_app_browsertest_util.h"
 #include "chrome/browser/extensions/platform_app_launcher.h"
 #include "chrome/browser/extensions/shell_window_registry.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/browser/ui/extensions/shell_window.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_intents_dispatcher.h"
 #include "content/public/test/test_utils.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/glue/web_intent_data.h"
 
 using content::WebContents;
@@ skipping 660 matching lines @@
 
   // Pretend that the app is supposed to be running.
   extension_prefs->SetExtensionRunning(extension->id(), true);
 
   ExtensionTestMessageListener restart_listener("onRestarted", false);
   AppRestoreServiceFactory::GetForProfile(browser()->profile())->
       HandleStartup(true);
   restart_listener.WaitUntilSatisfied();
 }
 
+// Tests that relaunching an app with devtools open reopens devtools.
+IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, DevToolsOpenedWithReload) {
+  using content::DevToolsAgentHostRegistry;
+
+  ExtensionTestMessageListener launched_listener("Launched", false);
+  const Extension* extension = LoadAndLaunchPlatformApp("minimal_id");
+  ASSERT_TRUE(extension);
+  ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
+  ShellWindow* window = GetFirstShellWindow();
+  ASSERT_TRUE(window);
+  content::RenderViewHost* rvh = window->web_contents()->GetRenderViewHost();
+  ASSERT_TRUE(rvh);
+  ASSERT_FALSE(DevToolsAgentHostRegistry::HasDevToolsAgentHost(rvh));
+  DevToolsWindow* devtools_window = DevToolsWindow::OpenDevToolsWindow(rvh);
+  content::WindowedNotificationObserver loaded_observer(
+      content::NOTIFICATION_LOAD_STOP,
+      content::Source<content::NavigationController>(
+          &devtools_window->tab_contents()
+          ->web_contents()->GetController()));
+
+  loaded_observer.Wait();
+  ASSERT_TRUE(DevToolsAgentHostRegistry::HasDevToolsAgentHost(rvh));
+
+  CloseShellWindow(window);

[tapted, 2012/10/23 10:16:45]

This line triggers http://crbug.com/157097 when (WebKit is) compiled with NDEBUG
(release builds don't have the funky pointer dereference).

Should we add

#ifdef NDEBUG
EXPECT_FAIL (..)
#else
EXPECT_PASS (..)
#endif

?


Expecting (any non-release?) trybots to spew out some of these:

[32110:32110:1023/205245:ERROR:process_util_posix.cc(144)] Received signal 11
	base::debug::StackTrace::StackTrace() [0x7f62da6008e6]
	base::(anonymous namespace)::StackDumpSignalHandler() [0x7f62da664829]
	0x7f62cddeb4a0
	WebCore::GraphicsLayer::willBeDestroyed() [0x7f62d68ce806]
	WebCore::GraphicsLayerChromium::willBeDestroyed() [0x7f62d68f25ca]
	WebCore::GraphicsLayerChromium::~GraphicsLayerChromium() [0x7f62d68f2480]
	WebCore::GraphicsLayerChromium::~GraphicsLayerChromium() [0x7f62d68f2560]
	WTF::deleteOwnedPtr<>() [0x7f62d5d2c2d4]
	WTF::OwnPtr<>::~OwnPtr() [0x7f62d5d2c145]
	WebKit::PageOverlay::~PageOverlay() [0x7f62d5d342bc]
	WTF::deleteOwnedPtr<>() [0x7f62d5d347a0]
	WTF::OwnPtr<>::~OwnPtr() [0x7f62d5d34417]
	WTF::VectorDestructor<>::destruct() [0x7f62d5d34bd2]
	WTF::VectorTypeOperations<>::destruct() [0x7f62d5d34ac2]
	WTF::Vector<>::shrink() [0x7f62d5d34770]
	WTF::Vector<>::~Vector() [0x7f62d5d343a5]
	WebKit::PageOverlayList::~PageOverlayList() [0x7f62d5d33d92]
	WTF::deleteOwnedPtr<>() [0x7f62d5de0602]
	WTF::OwnPtr<>::~OwnPtr() [0x7f62d5dde421]
	WebKit::WebViewImpl::~WebViewImpl() [0x7f62d5dcd4c6]
	WebKit::WebViewImpl::~WebViewImpl() [0x7f62d5dcd676]
	WTF::RefCounted<>::deref() [0x7f62d5ddf058]
	WebKit::WebViewImpl::close() [0x7f62d5dd1a8c]
	content::RenderWidget::Close() [0x7f62d36f163c]
	content::RenderViewImpl::Close() [0x7f62d36d241a]

[benwells, 2012/10/23 10:27:14]

#if NDEBUG sg, with a comment linking to the bug.

[tapted, 2012/10/23 23:41:15]

Done.

+  ASSERT_FALSE(GetFirstShellWindow()); // No ShellWindows.
+
+  content::WindowedNotificationObserver app_loaded_observer(
+      content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
+      content::NotificationService::AllSources());
+  application_launch::OpenApplication(application_launch::LaunchParams(
+          browser()->profile(), extension, extension_misc::LAUNCH_NONE,
+          NEW_WINDOW));
+  app_loaded_observer.Wait();
+  window = GetFirstShellWindow();
+  ASSERT_TRUE(window);
+  rvh = window->web_contents()->GetRenderViewHost();
+  ASSERT_TRUE(rvh);
+  ASSERT_TRUE(DevToolsAgentHostRegistry::HasDevToolsAgentHost(rvh));
+}
+
 }  // namespace extensions