Revert the fix for 538784.

content/browser/loader/cross_site_resource_handler_browsertest.cc

 // Copyright 2015 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/callback.h"
 #include "base/command_line.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
@@ skipping 221 matching lines @@
   // this without also cancelling the pending navigation (as blink would, if you
   // removed the iframe from the document via js).
   rfh->OnMessageReceived(FrameHostMsg_Detach(frame_routing_id));
   done_cb.Run();
 }
 
 }  // namespace
 
 // Regression test for https://crbug.com/538784 -- ensures that one can't
 // sidestep CrossSiteResourceHandler by detaching a frame mid-request.
+//
+// TODO(nick): Disabled until we re-land the fix for https://crbug.com/538784.
 IN_PROC_BROWSER_TEST_F(CrossSiteResourceHandlerTest,
-                       NoDeliveryToDetachedFrame) {
+                       DISABLED_NoDeliveryToDetachedFrame) {
   GURL attacker_page = embedded_test_server()->GetURL(
       "evil.com", "/cross_site_iframe_factory.html?evil(evil)");
   EXPECT_TRUE(NavigateToURL(shell(), attacker_page));
 
   FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())
                             ->GetFrameTree()
                             ->root();
 
   RenderFrameHost* child_frame = root->child_at(0)->current_frame_host();
 
@@ skipping 14 matching lines @@
       base::StringPrintf("document.getElementById('child-0').src='%s'",
                          target_resource.spec().c_str())));
 
   // Wait for the scenario to play out. If this returns false, it means the
   // request did not succeed, which is good in this case.
   EXPECT_FALSE(tracking_delegate().WaitForTrackedURLAndGetCompleted())
       << "Request should have been cancelled before reaching the renderer.";
 }
 
 }  // namespace content