Make the request initiator Optional

content/browser/loader/resource_dispatcher_host_browsertest.cc

Index: content/browser/loader/resource_dispatcher_host_browsertest.cc
diff --git a/content/browser/loader/resource_dispatcher_host_browsertest.cc b/content/browser/loader/resource_dispatcher_host_browsertest.cc
index e69f948ee4765e42e3774791a34f5e045de70645..cc377906a3916356b2248be0a837e20b924d94bf 100644
--- a/content/browser/loader/resource_dispatcher_host_browsertest.cc
+++ b/content/browser/loader/resource_dispatcher_host_browsertest.cc
@@ -755,11 +755,11 @@ 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) {}
 };
 
@@ -831,7 +831,8 @@ IN_PROC_BROWSER_TEST_F(RequestDataResourceDispatcherHostBrowserTest, Basic) {
   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);
   }
 }
 
@@ -854,11 +855,13 @@ IN_PROC_BROWSER_TEST_F(RequestDataResourceDispatcherHostBrowserTest,
   // 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
@@ -866,7 +869,8 @@ IN_PROC_BROWSER_TEST_F(RequestDataResourceDispatcherHostBrowserTest,
   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);
   }
 }
 
@@ -885,19 +889,22 @@ IN_PROC_BROWSER_TEST_F(RequestDataResourceDispatcherHostBrowserTest,
   // 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,
@@ -924,13 +931,15 @@ IN_PROC_BROWSER_TEST_F(RequestDataResourceDispatcherHostBrowserTest,
   // 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,
@@ -965,13 +974,15 @@ IN_PROC_BROWSER_TEST_F(RequestDataResourceDispatcherHostBrowserTest,
   // 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,
@@ -989,7 +1000,8 @@ IN_PROC_BROWSER_TEST_F(RequestDataResourceDispatcherHostBrowserTest,
   // 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,
@@ -1014,23 +1026,27 @@ IN_PROC_BROWSER_TEST_F(RequestDataResourceDispatcherHostBrowserTest,
   // 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