diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-28 01:31:42 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-28 01:31:42 +0000 |
| commit | 5dcaf8ec918ad9caa97218b7921eb7946911248e (patch) | |
| tree | 20f1a270d45b6f099fdf25e0ac9706db4caf1f74 /content/browser/loader | |
| parent | c5eb493a7014001fb05fd923f6d976fefafa0559 (diff) | |
| download | chromium_src-5dcaf8ec918ad9caa97218b7921eb7946911248e.zip chromium_src-5dcaf8ec918ad9caa97218b7921eb7946911248e.tar.gz chromium_src-5dcaf8ec918ad9caa97218b7921eb7946911248e.tar.bz2 | |
Replace the GetAssociatedRenderView call with GetAssociatedRenderFrame in InterceptNavigationResourceThrottle.
BUG=304341
Review URL: https://codereview.chromium.org/106203003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242655 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/loader')
| -rw-r--r-- | content/browser/loader/resource_loader_unittest.cc | 3 | ||||
| -rw-r--r-- | content/browser/loader/resource_request_info_impl.cc | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/content/browser/loader/resource_loader_unittest.cc b/content/browser/loader/resource_loader_unittest.cc index 8f96211..0132d5d 100644 --- a/content/browser/loader/resource_loader_unittest.cc +++ b/content/browser/loader/resource_loader_unittest.cc @@ -11,6 +11,7 @@ #include "content/public/test/mock_resource_context.h" #include "content/public/test/test_browser_thread_bundle.h" #include "content/test/test_content_browser_client.h" +#include "ipc/ipc_message.h" #include "net/base/request_priority.h" #include "net/cert/x509_certificate.h" #include "net/ssl/client_cert_store.h" @@ -222,6 +223,7 @@ TEST_F(ResourceLoaderTest, ClientCertStoreLookup) { &resource_context_, kRenderProcessId, kRenderViewId, + MSG_ROUTING_NONE, false); // Set up the test client cert store. @@ -287,6 +289,7 @@ TEST_F(ResourceLoaderTest, ClientCertStoreNull) { &resource_context_, kRenderProcessId, kRenderViewId, + MSG_ROUTING_NONE, false); // Ownership of the |request| is about to be turned over to ResourceLoader. We diff --git a/content/browser/loader/resource_request_info_impl.cc b/content/browser/loader/resource_request_info_impl.cc index c1ccc91..71e748f 100644 --- a/content/browser/loader/resource_request_info_impl.cc +++ b/content/browser/loader/resource_request_info_impl.cc @@ -29,6 +29,7 @@ void ResourceRequestInfo::AllocateForTesting( ResourceContext* context, int render_process_id, int render_view_id, + int render_frame_id, bool is_async) { ResourceRequestInfoImpl* info = new ResourceRequestInfoImpl( @@ -37,7 +38,7 @@ void ResourceRequestInfo::AllocateForTesting( render_view_id, // route_id 0, // origin_pid 0, // request_id - MSG_ROUTING_NONE, // render_frame_id + render_frame_id, // render_frame_id resource_type == ResourceType::MAIN_FRAME, // is_main_frame 0, // frame_id false, // parent_is_main_frame |