MediaFeedsFetcher: Remove unnecessary use of attach_same_site_cookies

Bug: 1068792
Change-Id: Ide572da6ab9bb79e4aeb5c029c711f3feed456fe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2141439Reviewed-by: Becca Hughes <beccahughes@chromium.org>
Commit-Queue: Lily Chen <chlily@chromium.org>
Cr-Commit-Position: refs/heads/master@{#757585}

chrome/browser/media/feeds/media_feeds_fetcher.cc

@@ -62,9 +62,9 @@ void MediaFeedsFetcher::FetchFeed(const GURL& url, MediaFeedCallback callback) {
   resource_request->headers.SetHeader(net::HttpRequestHeaders::kAccept,
                                       "application/ld+json");
   resource_request->redirect_mode = ::network::mojom::RedirectMode::kError;
-  resource_request->attach_same_site_cookies = true;
-  resource_request->site_for_cookies = net::SiteForCookies::FromUrl(url);
   url::Origin origin = url::Origin::Create(url);
+  // Treat this request as same-site for the purposes of cookie inclusion.
+  resource_request->site_for_cookies = net::SiteForCookies::FromOrigin(origin);
   resource_request->trusted_params = network::ResourceRequest::TrustedParams();
   resource_request->trusted_params->network_isolation_key =
       net::NetworkIsolationKey(origin, origin);

chrome/browser/media/feeds/media_feeds_fetcher_unittest.cc

@@ -61,7 +61,6 @@ class MediaFeedsFetcherTest : public ChromeRenderViewHostTestHarness {
     task_environment()->RunUntilIdle();
 
     ASSERT_TRUE(GetCurrentRequest().url.is_valid());
-    EXPECT_TRUE(GetCurrentRequest().attach_same_site_cookies);
     EXPECT_TRUE(GetCurrentRequest().site_for_cookies.IsEquivalent(
         net::SiteForCookies::FromUrl(GURL(kTestUrl))));
     EXPECT_EQ(GetCurrentlyQueriedHeaderValue(net::HttpRequestHeaders::kAccept),
@@ -84,12 +83,8 @@ class MediaFeedsFetcherTest : public ChromeRenderViewHostTestHarness {
         url, value, base::Time::Now(), base::nullopt /* server_time */));
     EXPECT_TRUE(cc.get());
 
-    net::CookieOptions options;
-    options.set_include_httponly();
-    options.set_same_site_cookie_context(
-        net::CookieOptions::SameSiteCookieContext::MakeInclusive());
     cookie_manager->SetCanonicalCookie(
-        *cc.get(), url.scheme(), options,
+        *cc.get(), url.scheme(), net::CookieOptions::MakeAllInclusive(),
         base::BindOnce(
             [](bool* result, base::RunLoop* run_loop,
                net::CanonicalCookie::CookieInclusionStatus set_cookie_status) {