Make the request initiator Optional

content/browser/loader/resource_dispatcher_host_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/browser/resource_dispatcher_host.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 737 matching lines @@
   shell()->web_contents()->GetController().ReloadDisableLoFi(true);
   tab_observer.Wait();
   CheckResourcesRequested(false);
 }
 
 namespace {
 
 struct RequestDataForDelegate {
   const GURL url;
   const GURL first_party;
-  const url::Origin initiator;
+  scoped_refptr<url::NullableOrigin> initiator;
 
   RequestDataForDelegate(const GURL& url,
                          const GURL& first_party,
-                         const url::Origin initiator)
+                         scoped_refptr<url::NullableOrigin> initiator)
       : url(url), first_party(first_party), initiator(initiator) {}
 };
 
 // Captures calls to 'RequestBeginning' and records the URL, first-party for
 // cookies, and initiator.
 class RequestDataResourceDispatcherHostDelegate
     : public ResourceDispatcherHostDelegate {
  public:
   RequestDataResourceDispatcherHostDelegate() {}
 
@@ skipping 51 matching lines @@
   NavigateToURLBlockUntilNavigationsComplete(shell(), top_url, 1);
 
   EXPECT_EQ(8u, delegate_->data().size());
 
   // All resources loaded directly by the top-level document (including the
   // top-level document itself) should have a |first_party| and |initiator|
   // that match the URL of the top-level document.
   for (auto* request : delegate_->data()) {
     SCOPED_TRACE(request->url);
     EXPECT_EQ(top_url, request->first_party);
-    EXPECT_EQ(top_origin, request->initiator);
+    ASSERT_TRUE(request->initiator);
+    EXPECT_EQ(top_origin, *request->initiator);
   }
 }
 
 IN_PROC_BROWSER_TEST_F(RequestDataResourceDispatcherHostBrowserTest,
                        BasicCrossSite) {
   host_resolver()->AddRule("*", "127.0.0.1");
   GURL top_url(embedded_test_server()->GetURL(
       "a.com", "/nested_page_with_subresources.html"));
   GURL nested_url(embedded_test_server()->GetURL(
       "not-a.com", "/page_with_subresources.html"));
   url::Origin top_origin(top_url);
   url::Origin nested_origin(nested_url);
 
   NavigateToURLBlockUntilNavigationsComplete(shell(), top_url, 1);
 
   EXPECT_EQ(9u, delegate_->data().size());
 
   // The first items loaded are the top-level and nested documents. These should
   // both have a |first_party| and |initiator| that match the URL of the
   // top-level document:
   EXPECT_EQ(top_url, delegate_->data()[0]->url);
   EXPECT_EQ(top_url, delegate_->data()[0]->first_party);
-  EXPECT_EQ(top_origin, delegate_->data()[0]->initiator);
+  ASSERT_TRUE(delegate_->data()[0]->initiator);
+  EXPECT_EQ(top_origin, *delegate_->data()[0]->initiator);
 
   EXPECT_EQ(nested_url, delegate_->data()[1]->url);
   EXPECT_EQ(top_url, delegate_->data()[1]->first_party);
-  EXPECT_EQ(top_origin, delegate_->data()[1]->initiator);
+  ASSERT_TRUE(delegate_->data()[1]->initiator);
+  EXPECT_EQ(top_origin, *delegate_->data()[1]->initiator);
 
   // The remaining items are loaded as subresources in the nested document, and
   // should have a unique first-party, and an initiator that matches the
   // document in which they're embedded.
   for (size_t i = 2; i < delegate_->data().size(); i++) {
     SCOPED_TRACE(delegate_->data()[i]->url);
     EXPECT_EQ(kURLWithUniqueOrigin, delegate_->data()[i]->first_party);
-    EXPECT_EQ(nested_origin, delegate_->data()[i]->initiator);
+    ASSERT_TRUE(delegate_->data()[i]->initiator);
+    EXPECT_EQ(nested_origin, *delegate_->data()[i]->initiator);
   }
 }
 
 IN_PROC_BROWSER_TEST_F(RequestDataResourceDispatcherHostBrowserTest,
                        SameOriginNested) {
   GURL top_url(embedded_test_server()->GetURL("/page_with_iframe.html"));
   GURL image_url(embedded_test_server()->GetURL("/image.jpg"));
   GURL nested_url(embedded_test_server()->GetURL("/title1.html"));
   url::Origin top_origin(top_url);
 
   NavigateToURLBlockUntilNavigationsComplete(shell(), top_url, 1);
 
   EXPECT_EQ(3u, delegate_->data().size());
 
   // User-initiated top-level navigations have a first-party and initiator that
   // matches the URL to which they navigate.
   EXPECT_EQ(top_url, delegate_->data()[0]->url);
   EXPECT_EQ(top_url, delegate_->data()[0]->first_party);
-  EXPECT_EQ(top_origin, delegate_->data()[0]->initiator);
+  ASSERT_TRUE(delegate_->data()[0]->initiator);
+  EXPECT_EQ(top_origin, *delegate_->data()[0]->initiator);
 
   // Subresource requests have a first-party and initiator that matches the
   // document in which they're embedded.
   EXPECT_EQ(image_url, delegate_->data()[1]->url);
   EXPECT_EQ(top_url, delegate_->data()[1]->first_party);
-  EXPECT_EQ(top_origin, delegate_->data()[1]->initiator);
+  ASSERT_TRUE(delegate_->data()[1]->initiator);
+  EXPECT_EQ(top_origin, *delegate_->data()[1]->initiator);
 
   // Same-origin nested frames have a first-party and initiator that matches
   // the document in which they're embedded.
   EXPECT_EQ(nested_url, delegate_->data()[2]->url);
   EXPECT_EQ(top_url, delegate_->data()[2]->first_party);
-  EXPECT_EQ(top_origin, delegate_->data()[2]->initiator);
+  ASSERT_TRUE(delegate_->data()[2]->initiator);
+  EXPECT_EQ(top_origin, *delegate_->data()[2]->initiator);
 }
 
 IN_PROC_BROWSER_TEST_F(RequestDataResourceDispatcherHostBrowserTest,
                        SameOriginAuxiliary) {
   GURL top_url(embedded_test_server()->GetURL("/simple_links.html"));
   GURL auxiliary_url(embedded_test_server()->GetURL("/title2.html"));
   url::Origin top_origin(top_url);
 
   NavigateToURLBlockUntilNavigationsComplete(shell(), top_url, 1);
 
   ShellAddedObserver new_shell_observer;
   bool success = false;
   EXPECT_TRUE(ExecuteScriptAndExtractBool(
       shell(),
       "window.domAutomationController.send(clickSameSiteNewWindowLink());",
       &success));
   EXPECT_TRUE(success);
   Shell* new_shell = new_shell_observer.GetShell();
   WaitForLoadStop(new_shell->web_contents());
 
   EXPECT_EQ(2u, delegate_->data().size());
 
   // User-initiated top-level navigations have a first-party and initiator that
   // matches the URL to which they navigate, even if they fail to load.
   EXPECT_EQ(top_url, delegate_->data()[0]->url);
   EXPECT_EQ(top_url, delegate_->data()[0]->first_party);
-  EXPECT_EQ(top_origin, delegate_->data()[0]->initiator);
+  ASSERT_TRUE(delegate_->data()[0]->initiator);
+  EXPECT_EQ(top_origin, *delegate_->data()[0]->initiator);
 
   // Auxiliary navigations have a first-party that matches the URL to which they
   // navigate, and an initiator that matches the document that triggered them.
   EXPECT_EQ(auxiliary_url, delegate_->data()[1]->url);
   EXPECT_EQ(auxiliary_url, delegate_->data()[1]->first_party);
-  EXPECT_EQ(top_origin, delegate_->data()[1]->initiator);
+  ASSERT_TRUE(delegate_->data()[1]->initiator);
+  EXPECT_EQ(top_origin, *delegate_->data()[1]->initiator);
 }
 
 IN_PROC_BROWSER_TEST_F(RequestDataResourceDispatcherHostBrowserTest,
                        CrossOriginAuxiliary) {
   GURL top_url(embedded_test_server()->GetURL("/simple_links.html"));
   GURL auxiliary_url(embedded_test_server()->GetURL("foo.com", "/title2.html"));
   url::Origin top_origin(top_url);
 
   NavigateToURLBlockUntilNavigationsComplete(shell(), top_url, 1);
 
@@ skipping 14 matching lines @@
   EXPECT_TRUE(success);
   Shell* new_shell = new_shell_observer.GetShell();
   WaitForLoadStop(new_shell->web_contents());
 
   EXPECT_EQ(2u, delegate_->data().size());
 
   // User-initiated top-level navigations have a first-party and initiator that
   // matches the URL to which they navigate, even if they fail to load.
   EXPECT_EQ(top_url, delegate_->data()[0]->url);
   EXPECT_EQ(top_url, delegate_->data()[0]->first_party);
-  EXPECT_EQ(top_origin, delegate_->data()[0]->initiator);
+  ASSERT_TRUE(delegate_->data()[0]->initiator);
+  EXPECT_EQ(top_origin, *delegate_->data()[0]->initiator);
 
   // Auxiliary navigations have a first-party that matches the URL to which they
   // navigate, and an initiator that matches the document that triggered them.
   EXPECT_EQ(auxiliary_url, delegate_->data()[1]->url);
   EXPECT_EQ(auxiliary_url, delegate_->data()[1]->first_party);
-  EXPECT_EQ(top_origin, delegate_->data()[1]->initiator);
+  ASSERT_TRUE(delegate_->data()[1]->initiator);
+  EXPECT_EQ(top_origin, *delegate_->data()[1]->initiator);
 }
 
 IN_PROC_BROWSER_TEST_F(RequestDataResourceDispatcherHostBrowserTest,
                        FailedNavigation) {
   // Navigating to this URL will fail, as we haven't taught the host resolver
   // about 'a.com'.
   GURL top_url(embedded_test_server()->GetURL("a.com", "/simple_page.html"));
   url::Origin top_origin(top_url);
 
   NavigateToURLBlockUntilNavigationsComplete(shell(), top_url, 1);
 
   EXPECT_EQ(1u, delegate_->data().size());
 
   // User-initiated top-level navigations have a first-party and initiator that
   // matches the URL to which they navigate, even if they fail to load.
   EXPECT_EQ(top_url, delegate_->data()[0]->url);
   EXPECT_EQ(top_url, delegate_->data()[0]->first_party);
-  EXPECT_EQ(top_origin, delegate_->data()[0]->initiator);
+  ASSERT_TRUE(delegate_->data()[0]->initiator);
+  EXPECT_EQ(top_origin, *delegate_->data()[0]->initiator);
 }
 
 IN_PROC_BROWSER_TEST_F(RequestDataResourceDispatcherHostBrowserTest,
                        CrossOriginNested) {
   host_resolver()->AddRule("*", "127.0.0.1");
   GURL top_url(embedded_test_server()->GetURL(
       "a.com", "/cross_site_iframe_factory.html?a(b)"));
   GURL top_js_url(
       embedded_test_server()->GetURL("a.com", "/tree_parser_util.js"));
   GURL nested_url(embedded_test_server()->GetURL(
       "b.com", "/cross_site_iframe_factory.html?b()"));
   GURL nested_js_url(
       embedded_test_server()->GetURL("b.com", "/tree_parser_util.js"));
   url::Origin top_origin(top_url);
   url::Origin nested_origin(nested_url);
 
   NavigateToURLBlockUntilNavigationsComplete(shell(), top_url, 1);
 
   EXPECT_EQ(4u, delegate_->data().size());
 
   // User-initiated top-level navigations have a first-party and initiator that
   // matches the URL to which they navigate.
   EXPECT_EQ(top_url, delegate_->data()[0]->url);
   EXPECT_EQ(top_url, delegate_->data()[0]->first_party);
-  EXPECT_EQ(top_origin, delegate_->data()[0]->initiator);
+  ASSERT_TRUE(delegate_->data()[0]->initiator);
+  EXPECT_EQ(top_origin, *delegate_->data()[0]->initiator);
 
   EXPECT_EQ(top_js_url, delegate_->data()[1]->url);
   EXPECT_EQ(top_url, delegate_->data()[1]->first_party);
-  EXPECT_EQ(top_origin, delegate_->data()[1]->initiator);
+  ASSERT_TRUE(delegate_->data()[1]->initiator);
+  EXPECT_EQ(top_origin, *delegate_->data()[1]->initiator);
 
   // Cross-origin frames have a first-party and initiator that matches the URL
   // in which they're embedded.
   EXPECT_EQ(nested_url, delegate_->data()[2]->url);
   EXPECT_EQ(top_url, delegate_->data()[2]->first_party);
-  EXPECT_EQ(top_origin, delegate_->data()[2]->initiator);
+  ASSERT_TRUE(delegate_->data()[2]->initiator);
+  EXPECT_EQ(top_origin, *delegate_->data()[2]->initiator);
 
   // Cross-origin subresource requests have a unique first-party, and an
   // initiator that matches the document in which they're embedded.
   EXPECT_EQ(nested_js_url, delegate_->data()[3]->url);
   EXPECT_EQ(kURLWithUniqueOrigin, delegate_->data()[3]->first_party);
-  EXPECT_EQ(nested_origin, delegate_->data()[3]->initiator);
+  ASSERT_TRUE(delegate_->data()[3]->initiator);
+  EXPECT_EQ(nested_origin, *delegate_->data()[3]->initiator);
 }
 
 }  // namespace content