Correctly set requestor origin for worker initiated requests.

third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp

 /*
  * Copyright (c) 2015, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 427 matching lines @@
     // Child frame as part of reload bypassing cache
     document->frame()->loader().setLoadType(FrameLoadTypeReloadBypassingCache);
     EXPECT_EQ(WebCachePolicy::BypassingCache, childFetchContext->resourceRequestCachePolicy(request, Resource::MainResource, FetchRequest::NoDefer));
 }
 
 TEST_F(FrameFetchContextTest, PopulateRequestData)
 {
     struct TestCase {
         const char* documentURL;
         bool documentSandboxed;
-        const char* requestorOrigin; // "" => nullptr, "null" => unique origin
+        const char* requestorOrigin; // "" => unique origin
         WebURLRequest::FrameType frameType;
-        const char* serializedOrigin; // "" => nullptr, "null" => unique origin
+        const char* serializedOrigin; // "" => unique origin
     } cases[] = {
         // No document origin => unique request origin
         { "", false, "", WebURLRequest::FrameTypeNone, "null" },
         { "", true, "", WebURLRequest::FrameTypeNone, "null" },
 
         // Document origin => request origin
         { "http://example.test", false, "", WebURLRequest::FrameTypeNone, "http://example.test" },
         { "http://example.test", true, "", WebURLRequest::FrameTypeNone, "http://example.test" },
 
         // If the request already has a requestor origin, then 'populateRequestData' leaves it alone:
@@ skipping 17 matching lines @@
         // Setup the test:
         document->setURL(KURL(ParsedURLString, test.documentURL));
         document->setSecurityOrigin(SecurityOrigin::create(document->url()));
 
         if (test.documentSandboxed)
             document->enforceSandboxFlags(SandboxOrigin);
 
         ResourceRequest request("http://example.test/");
         request.setFrameType(test.frameType);
         if (strlen(test.requestorOrigin) == 0)
-            request.setRequestorOrigin(nullptr);
+            request.setRequestorOrigin(SecurityOrigin::createUnique());
         else
             request.setRequestorOrigin(SecurityOrigin::create(KURL(ParsedURLString, test.requestorOrigin)));
 
         // Compare the populated |requestorOrigin| against |test.serializedOrigin|
         fetchContext->populateRequestData(request);
         if (strlen(test.serializedOrigin) == 0)
-            EXPECT_FALSE(request.requestorOrigin().get());
+            EXPECT_TRUE(request.requestorOrigin()->isUnique());
         else
             EXPECT_EQ(String(test.serializedOrigin), request.requestorOrigin()->toString());
 
         EXPECT_EQ(document->firstPartyForCookies(), request.firstPartyForCookies());
     }
 }
 
 TEST_F(FrameFetchContextTest, ModifyPriorityForLowPriorityIframes)
 {
     Settings* settings = document->frame()->settings();
@@ skipping 181 matching lines @@
         fetchContext->addAdditionalRequestHeaders(mainRequest, FetchMainResource);
         EXPECT_EQ(test.isExternalExpectation, mainRequest.isExternalRequest());
 
         ResourceRequest subRequest(test.url);
         fetchContext->addAdditionalRequestHeaders(subRequest, FetchSubresource);
         EXPECT_EQ(test.isExternalExpectation, subRequest.isExternalRequest());
     }
 }
 
 } // namespace blink