AW: Use proper context for CookieManager.SetCookie

It should be treated as a 1st party context, not 3rd party one.

Bug: 1012742
Change-Id: Ic8ceb0c7f2e60e15b4517550c50ab67c637b492c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1853044
Commit-Queue: Maksim Orlovich <morlovich@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#704748}

android_webview/browser/cookie_manager.cc

@@ -405,9 +405,6 @@ void CookieManager::SetCookieSync(JNIEnv* env,
 void CookieManager::SetCookieHelper(const GURL& host,
                                     const std::string& value,
                                     base::OnceCallback<void(bool)> callback) {
-  net::CookieOptions options;
-  options.set_include_httponly();
-
   const GURL& new_host = MaybeFixUpSchemeForSecureCookie(host, value);
 
   net::CanonicalCookie::CookieInclusionStatus status;
@@ -429,12 +426,13 @@ void CookieManager::SetCookieHelper(const GURL& host,
     // *cc.get() is safe, because network::CookieManager::SetCanonicalCookie
     // will make a copy before our smart pointer goes out of scope.
     GetMojoCookieManager()->SetCanonicalCookie(
-        *cc.get(), new_host.scheme(), options,
+        *cc.get(), new_host.scheme(), net::CookieOptions::MakeAllInclusive(),
         net::cookie_util::AdaptCookieInclusionStatusToBool(
             std::move(callback)));
   } else {
     GetCookieStore()->SetCanonicalCookieAsync(
-        std::move(cc), new_host.scheme(), options,
+        std::move(cc), new_host.scheme(),
+        net::CookieOptions::MakeAllInclusive(),
         net::cookie_util::AdaptCookieInclusionStatusToBool(
             std::move(callback)));
   }
@@ -458,10 +456,7 @@ ScopedJavaLocalRef<jstring> CookieManager::GetCookie(
 void CookieManager::GetCookieListAsyncHelper(const GURL& host,
                                              net::CookieList* result,
                                              base::OnceClosure complete) {
-  net::CookieOptions options;
-  options.set_include_httponly();
-  options.set_same_site_cookie_context(
-      net::CookieOptions::SameSiteCookieContext::SAME_SITE_STRICT);
+  net::CookieOptions options = net::CookieOptions::MakeAllInclusive();
 
   if (GetMojoCookieManager()) {
     GetMojoCookieManager()->GetCookieList(

android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java

@@ -322,6 +322,16 @@ public class CookieManagerTest {
                         SECURE_COOKIE_HISTOGRAM_NAME, 3 /* kNotASecureCookie */));
     }
 
+    @Test
+    @MediumTest
+    @Feature({"AndroidWebView", "Privacy"})
+    public void testSetCookieSameSite() {
+        String url = "http://www.example.com";
+        String cookie = "name=test";
+        mCookieManager.setCookie(url, cookie + "; SameSite=Lax");
+        assertCookieEquals(cookie, url);
+    }
+
     @Test
     @MediumTest
     @Feature({"AndroidWebView", "Privacy"})