| OLD | NEW |
|---|
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 <stdint.h> | 5 #include <stdint.h> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/containers/hash_tables.h" | 8 #include "base/containers/hash_tables.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| 11 #include "build/build_config.h" | 11 #include "build/build_config.h" |
| 12 #include "content/browser/bad_message.h" | 12 #include "content/browser/bad_message.h" |
| 13 #include "content/browser/dom_storage/dom_storage_context_wrapper.h" | 13 #include "content/browser/dom_storage/dom_storage_context_wrapper.h" |
| 14 #include "content/browser/dom_storage/session_storage_namespace_impl.h" | 14 #include "content/browser/dom_storage/session_storage_namespace_impl.h" |
| 15 #include "content/browser/frame_host/navigator.h" | 15 #include "content/browser/frame_host/navigator.h" |
| 16 #include "content/browser/frame_host/render_frame_host_impl.h" | 16 #include "content/browser/frame_host/render_frame_host_impl.h" |
| 17 #include "content/browser/renderer_host/render_view_host_factory.h" | 17 #include "content/browser/renderer_host/render_view_host_factory.h" |
| 18 #include "content/browser/renderer_host/render_view_host_impl.h" | 18 #include "content/browser/renderer_host/render_view_host_impl.h" |
| 19 #include "content/browser/web_contents/web_contents_impl.h" | 19 #include "content/browser/web_contents/web_contents_impl.h" |
| 20 #include "content/common/frame.mojom.h" | 20 #include "content/common/frame.mojom.h" |
| 21 #include "content/common/frame_messages.h" | 21 #include "content/common/frame_messages.h" |
| 22 #include "content/common/render_message_filter.mojom.h" | 22 #include "content/common/render_message_filter.mojom.h" |
| 23 #include "content/common/resource_messages.h" | 23 #include "content/common/resource_messages.h" |
| 24 #include "content/common/resource_request.h" | |
| 25 #include "content/common/view_messages.h" | 24 #include "content/common/view_messages.h" |
| 26 #include "content/public/browser/browser_context.h" | 25 #include "content/public/browser/browser_context.h" |
| 27 #include "content/public/browser/content_browser_client.h" | 26 #include "content/public/browser/content_browser_client.h" |
| 28 #include "content/public/browser/interstitial_page.h" | 27 #include "content/public/browser/interstitial_page.h" |
| 29 #include "content/public/browser/interstitial_page_delegate.h" | 28 #include "content/public/browser/interstitial_page_delegate.h" |
| 30 #include "content/public/browser/resource_context.h" | 29 #include "content/public/browser/resource_context.h" |
| 31 #include "content/public/browser/resource_dispatcher_host.h" | 30 #include "content/public/browser/resource_dispatcher_host.h" |
| 32 #include "content/public/browser/storage_partition.h" | 31 #include "content/public/browser/storage_partition.h" |
| 33 #include "content/public/common/appcache_info.h" | 32 #include "content/public/common/appcache_info.h" |
| 34 #include "content/public/common/browser_side_navigation_policy.h" | 33 #include "content/public/common/browser_side_navigation_policy.h" |
| 35 #include "content/public/common/content_switches.h" | 34 #include "content/public/common/content_switches.h" |
| 36 #include "content/public/common/file_chooser_params.h" | 35 #include "content/public/common/file_chooser_params.h" |
| 36 #include "content/public/common/resource_request.h" |
| 37 #include "content/public/common/resource_request_body.h" | 37 #include "content/public/common/resource_request_body.h" |
| 38 #include "content/public/test/browser_test_utils.h" | 38 #include "content/public/test/browser_test_utils.h" |
| 39 #include "content/public/test/content_browser_test.h" | 39 #include "content/public/test/content_browser_test.h" |
| 40 #include "content/public/test/content_browser_test_utils.h" | 40 #include "content/public/test/content_browser_test_utils.h" |
| 41 #include "content/public/test/test_utils.h" | 41 #include "content/public/test/test_utils.h" |
| 42 #include "content/shell/browser/shell.h" | 42 #include "content/shell/browser/shell.h" |
| 43 #include "content/test/content_browser_test_utils_internal.h" | 43 #include "content/test/content_browser_test_utils_internal.h" |
| 44 #include "content/test/test_content_browser_client.h" | 44 #include "content/test/test_content_browser_client.h" |
| 45 #include "ipc/ipc_security_test_util.h" | 45 #include "ipc/ipc_security_test_util.h" |
| 46 #include "net/dns/mock_host_resolver.h" | 46 #include "net/dns/mock_host_resolver.h" |
| (...skipping 561 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 608 // |target_url|. | 608 // |target_url|. |
| 609 WaitForLoadStop(shell()->web_contents()); | 609 WaitForLoadStop(shell()->web_contents()); |
| 610 EXPECT_EQ(start_url, root->current_frame_host()->GetLastCommittedURL()); | 610 EXPECT_EQ(start_url, root->current_frame_host()->GetLastCommittedURL()); |
| 611 | 611 |
| 612 // Verify that the malicious renderer got killed. | 612 // Verify that the malicious renderer got killed. |
| 613 exit_observer.Wait(); | 613 exit_observer.Wait(); |
| 614 EXPECT_FALSE(exit_observer.did_exit_normally()); | 614 EXPECT_FALSE(exit_observer.did_exit_normally()); |
| 615 } | 615 } |
| 616 | 616 |
| 617 } // namespace content | 617 } // namespace content |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2969463003:
Move resource_request.h to content/public/common. (Closed)
