| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/callback.h" | 5 #include "base/callback.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/memory/weak_ptr.h" | 7 #include "base/memory/weak_ptr.h" |
| 8 #include "base/single_thread_task_runner.h" | 8 #include "base/single_thread_task_runner.h" |
| 9 #include "base/thread_task_runner_handle.h" | 9 #include "base/thread_task_runner_handle.h" |
| 10 #include "content/browser/frame_host/render_frame_host_impl.h" | 10 #include "content/browser/frame_host/render_frame_host_impl.h" |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 CrossSiteResourceHandlerTest() : old_delegate_(nullptr) {} | 176 CrossSiteResourceHandlerTest() : old_delegate_(nullptr) {} |
| 177 | 177 |
| 178 // ContentBrowserTest implementation: | 178 // ContentBrowserTest implementation: |
| 179 void SetUpOnMainThread() override { | 179 void SetUpOnMainThread() override { |
| 180 BrowserThread::PostTask( | 180 BrowserThread::PostTask( |
| 181 BrowserThread::IO, FROM_HERE, | 181 BrowserThread::IO, FROM_HERE, |
| 182 base::Bind( | 182 base::Bind( |
| 183 &CrossSiteResourceHandlerTest::InjectResourceDispatcherHostDelegate, | 183 &CrossSiteResourceHandlerTest::InjectResourceDispatcherHostDelegate, |
| 184 base::Unretained(this))); | 184 base::Unretained(this))); |
| 185 host_resolver()->AddRule("*", "127.0.0.1"); | 185 host_resolver()->AddRule("*", "127.0.0.1"); |
| 186 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); | 186 ASSERT_TRUE(embedded_test_server()->Start()); |
| 187 content::SetupCrossSiteRedirector(embedded_test_server()); | 187 content::SetupCrossSiteRedirector(embedded_test_server()); |
| 188 } | 188 } |
| 189 | 189 |
| 190 void TearDownOnMainThread() override { | 190 void TearDownOnMainThread() override { |
| 191 BrowserThread::PostTask( | 191 BrowserThread::PostTask( |
| 192 BrowserThread::IO, FROM_HERE, | 192 BrowserThread::IO, FROM_HERE, |
| 193 base::Bind(&CrossSiteResourceHandlerTest:: | 193 base::Bind(&CrossSiteResourceHandlerTest:: |
| 194 RestoreResourceDispatcherHostDelegate, | 194 RestoreResourceDispatcherHostDelegate, |
| 195 base::Unretained(this))); | 195 base::Unretained(this))); |
| 196 } | 196 } |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 270 base::StringPrintf("document.getElementById('child-0').src='%s'", | 270 base::StringPrintf("document.getElementById('child-0').src='%s'", |
| 271 target_resource.spec().c_str()))); | 271 target_resource.spec().c_str()))); |
| 272 | 272 |
| 273 // Wait for the scenario to play out. If this returns false, it means the | 273 // Wait for the scenario to play out. If this returns false, it means the |
| 274 // request did not succeed, which is good in this case. | 274 // request did not succeed, which is good in this case. |
| 275 EXPECT_FALSE(tracking_delegate().WaitForTrackedURLAndGetCompleted()) | 275 EXPECT_FALSE(tracking_delegate().WaitForTrackedURLAndGetCompleted()) |
| 276 << "Request should have been cancelled before reaching the renderer."; | 276 << "Request should have been cancelled before reaching the renderer."; |
| 277 } | 277 } |
| 278 | 278 |
| 279 } // namespace content | 279 } // namespace content |
| OLD | NEW |