| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2015, Google Inc. All rights reserved. | 2 * Copyright (c) 2015, Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 #include "core/frame/FrameOwner.h" | 36 #include "core/frame/FrameOwner.h" |
| 37 #include "core/frame/FrameView.h" | 37 #include "core/frame/FrameView.h" |
| 38 #include "core/frame/Settings.h" | 38 #include "core/frame/Settings.h" |
| 39 #include "core/html/HTMLDocument.h" | 39 #include "core/html/HTMLDocument.h" |
| 40 #include "core/loader/DocumentLoader.h" | 40 #include "core/loader/DocumentLoader.h" |
| 41 #include "core/loader/EmptyClients.h" | 41 #include "core/loader/EmptyClients.h" |
| 42 #include "core/page/Page.h" | 42 #include "core/page/Page.h" |
| 43 #include "core/testing/DummyPageHolder.h" | 43 #include "core/testing/DummyPageHolder.h" |
| 44 #include "platform/network/ResourceRequest.h" | 44 #include "platform/network/ResourceRequest.h" |
| 45 #include "platform/weborigin/KURL.h" | 45 #include "platform/weborigin/KURL.h" |
| 46 #include "platform/weborigin/SecurityOrigin.h" |
| 46 #include "public/platform/WebAddressSpace.h" | 47 #include "public/platform/WebAddressSpace.h" |
| 47 #include "public/platform/WebCachePolicy.h" | 48 #include "public/platform/WebCachePolicy.h" |
| 48 #include "public/platform/WebInsecureRequestPolicy.h" | 49 #include "public/platform/WebInsecureRequestPolicy.h" |
| 49 #include "testing/gmock/include/gmock/gmock-generated-function-mockers.h" | 50 #include "testing/gmock/include/gmock/gmock-generated-function-mockers.h" |
| 50 #include "testing/gtest/include/gtest/gtest.h" | 51 #include "testing/gtest/include/gtest/gtest.h" |
| 51 #include <memory> | 52 #include <memory> |
| 52 | 53 |
| 53 namespace blink { | 54 namespace blink { |
| 54 | 55 |
| 55 class StubFrameLoaderClientWithParent final : public EmptyFrameLoaderClient { | 56 class StubFrameLoaderClientWithParent final : public EmptyFrameLoaderClient { |
| (...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 629 ResourceRequest mainRequest(test.url); | 630 ResourceRequest mainRequest(test.url); |
| 630 fetchContext->addAdditionalRequestHeaders(mainRequest, FetchMainResource
); | 631 fetchContext->addAdditionalRequestHeaders(mainRequest, FetchMainResource
); |
| 631 EXPECT_EQ(mainRequest.isExternalRequest(), test.isExternalExpectation); | 632 EXPECT_EQ(mainRequest.isExternalRequest(), test.isExternalExpectation); |
| 632 | 633 |
| 633 ResourceRequest subRequest(test.url); | 634 ResourceRequest subRequest(test.url); |
| 634 fetchContext->addAdditionalRequestHeaders(subRequest, FetchSubresource); | 635 fetchContext->addAdditionalRequestHeaders(subRequest, FetchSubresource); |
| 635 EXPECT_EQ(subRequest.isExternalRequest(), test.isExternalExpectation); | 636 EXPECT_EQ(subRequest.isExternalRequest(), test.isExternalExpectation); |
| 636 } | 637 } |
| 637 } | 638 } |
| 638 | 639 |
| 640 TEST_F(FrameFetchContextTest, PopulateRequestorData) |
| 641 { |
| 642 FrameFetchContext::provideDocumentToContext(*fetchContext, document.get()); |
| 643 KURL documentURL(ParsedURLString, "http://example.com/document.html"); |
| 644 document->setURL(documentURL); |
| 645 document->setSecurityOrigin(SecurityOrigin::create(documentURL)); |
| 646 |
| 647 { |
| 648 ResourceRequest request("http://not-example.com/"); |
| 649 request.setFrameType(WebURLRequest::FrameTypeNone); |
| 650 |
| 651 fetchContext->populateRequestorDataIfNecessary(request); |
| 652 |
| 653 EXPECT_TRUE(SecurityOrigin::create(document->url())->isSameSchemeHostPor
tAndSuborigin(request.requestorOrigin().get())); |
| 654 EXPECT_EQ(document->firstPartyForCookies(), request.firstPartyForCookies
()); |
| 655 } |
| 656 |
| 657 { |
| 658 ResourceRequest request("http://not-example.com/"); |
| 659 request.setFrameType(WebURLRequest::FrameTypeTopLevel); |
| 660 |
| 661 fetchContext->populateRequestorDataIfNecessary(request); |
| 662 |
| 663 EXPECT_TRUE(request.requestorOrigin()->isUnique()); |
| 664 EXPECT_EQ(KURL(), request.firstPartyForCookies()); |
| 665 } |
| 666 } |
| 667 |
| 639 } // namespace blink | 668 } // namespace blink |
| OLD | NEW |