Revert 165808 - Enable PlatformAppBrowserTest.DevToolsOpenedWithReload for debug builds.

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"
@@ skipping 680 matching lines @@
   extension_prefs->SetExtensionRunning(extension->id(), true);
 
   ExtensionTestMessageListener restart_listener("onRestarted", false);
   AppRestoreServiceFactory::GetForProfile(browser()->profile())->
       HandleStartup(true);
   restart_listener.WaitUntilSatisfied();
   CloseShellWindowsAndWaitForAppToExit();
 }
 
 // Tests that relaunching an app with devtools open reopens devtools.
-IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, DevToolsOpenedWithReload) {
+#ifdef NDEBUG
+#define MAYBE_DevToolsOpenedWithReload DevToolsOpenedWithReload
+#else
+// This is currently expected to fail in debug builds due to a segfault in
+// WebKit triggered by a dereference between #ifndef NDEBUG guards see
+// http://crbug.com/157097 .
+// The test is disabled because of timeouts, see http://crbug.com/158283.
+#define MAYBE_DevToolsOpenedWithReload DISABLED_DevToolsOpenedWithReload
+#endif
+
+IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_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);
@@ skipping 24 matching lines @@
   ASSERT_TRUE(window);
 
   // DevTools should have reopened with the relaunch.
   rvh = window->web_contents()->GetRenderViewHost();
   ASSERT_TRUE(rvh);
   ASSERT_TRUE(DevToolsAgentHostRegistry::HasDevToolsAgentHost(rvh));
   CloseShellWindowsAndWaitForAppToExit();
 }
 
 }  // namespace extensions