Remove dup'ed code for RequestorOrigin and FirstPartyCookie

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 745 matching lines @@
   document->Loader()->SetLoadType(kFrameLoadTypeBackForward);
   EXPECT_EQ(WebCachePolicy::kReturnCacheDataElseLoad,
             fetch_context->ResourceRequestCachePolicy(
                 conditional, Resource::kMock, FetchParameters::kNoDefer));
 }
 
 TEST_F(FrameFetchContextTest, SetFirstPartyCookieAndRequestorOrigin) {
   struct TestCase {
     const char* document_url;
     bool document_sandboxed;
-    const char* requestor_origin;  // "" => unique origin
+    const char* requestor_origin;  // "" => null
     WebURLRequest::FrameType frame_type;
-    const char* serialized_origin;  // "" => unique origin
+    const char* serialized_origin;  // "" => null
   } cases[] = {
       // No document origin => unique request origin
       {"", false, "", WebURLRequest::kFrameTypeNone, "null"},
       {"", true, "", WebURLRequest::kFrameTypeNone, "null"},
 
       // Document origin => request origin
       {"http://example.test", false, "", WebURLRequest::kFrameTypeNone,
        "http://example.test"},
       {"http://example.test", true, "", WebURLRequest::kFrameTypeNone,
        "http://example.test"},
 
       // If the request already has a requestor origin, then
-      // 'setFirstPartyCookieAndRequestorOrigin' leaves it alone:
+      // 'SetFirstPartyCookieAndRequestorOrigin' leaves it alone:
       {"http://example.test", false, "http://not-example.test",
        WebURLRequest::kFrameTypeNone, "http://not-example.test"},
       {"http://example.test", true, "http://not-example.test",
        WebURLRequest::kFrameTypeNone, "http://not-example.test"},
-
-      // If the request's frame type is not 'none', then
-      // 'setFirstPartyCookieAndRequestorOrigin'
-      // leaves it alone:
-      {"http://example.test", false, "", WebURLRequest::kFrameTypeTopLevel, ""},
-      {"http://example.test", false, "", WebURLRequest::kFrameTypeAuxiliary,
-       ""},
-      {"http://example.test", false, "", WebURLRequest::kFrameTypeNested, ""},

[kinuko, 2017/06/07 02:00:49]

Now SetFirstPartyCookieAndRequestorOrigin also handle these mostly in the same
way

   };
 
+  int index = 0;
   for (const auto& test : cases) {
-    SCOPED_TRACE(::testing::Message()
-                 << test.document_url << " => " << test.serialized_origin);
+    SCOPED_TRACE(::testing::Message() << index++ << " " << test.document_url
+                                      << " => " << test.serialized_origin);
     // Set up a new document to ensure sandbox flags are cleared:
     dummy_page_holder = DummyPageHolder::Create(IntSize(500, 500));
     dummy_page_holder->GetPage().SetDeviceScaleFactorDeprecated(1.0);
     document = &dummy_page_holder->GetDocument();
     FrameFetchContext::ProvideDocumentToContext(*fetch_context, document.Get());
 
     // Setup the test:
     document->SetURL(KURL(kParsedURLString, test.document_url));
     document->SetSecurityOrigin(SecurityOrigin::Create(document->Url()));
 
     if (test.document_sandboxed)
       document->EnforceSandboxFlags(kSandboxOrigin);
 
     ResourceRequest request("http://example.test/");
     request.SetFrameType(test.frame_type);
     if (strlen(test.requestor_origin) > 0) {
       request.SetRequestorOrigin(SecurityOrigin::Create(
           KURL(kParsedURLString, test.requestor_origin)));
     }
 
     // Compare the populated |requestorOrigin| against |test.serializedOrigin|
     fetch_context->SetFirstPartyCookieAndRequestorOrigin(request);
     if (strlen(test.serialized_origin) == 0) {
-      EXPECT_TRUE(request.RequestorOrigin()->IsUnique());
+      EXPECT_TRUE(!request.RequestorOrigin());
     } else {
       EXPECT_EQ(String(test.serialized_origin),
                 request.RequestorOrigin()->ToString());
     }
 
     EXPECT_EQ(document->FirstPartyForCookies(), request.FirstPartyForCookies());
   }
 }
 
 // Tests if "Save-Data" header is correctly added on the first load and reload.
@@ skipping 114 matching lines @@
   SetFilterPolicy(WebDocumentSubresourceFilter::kWouldDisallow);
 
   EXPECT_EQ(ResourceRequestBlockedReason::kNone, CanRequest());
   EXPECT_EQ(0, GetFilteredLoadCallCount());
 
   EXPECT_EQ(ResourceRequestBlockedReason::kNone, CanRequestPreload());
   EXPECT_EQ(0, GetFilteredLoadCallCount());
 }
 
 }  // namespace blink