Rename first-party-only cookies to same-site cookies.

chrome/browser/android/cookies/cookies_fetcher.cc

 // Copyright 2015 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 "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/time/time.h"
 #include "chrome/browser/android/cookies/cookies_fetcher.h"
@@ skipping 70 matching lines @@
       i != cookies.end(); ++i) {
     ScopedJavaLocalRef<jobject> java_cookie = Java_CookiesFetcher_createCookie(
         env, jobject_.obj(),
         base::android::ConvertUTF8ToJavaString(env, i->Source().spec()).obj(),
         base::android::ConvertUTF8ToJavaString(env, i->Name()).obj(),
         base::android::ConvertUTF8ToJavaString(env, i->Value()).obj(),
         base::android::ConvertUTF8ToJavaString(env, i->Domain()).obj(),
         base::android::ConvertUTF8ToJavaString(env, i->Path()).obj(),
         i->CreationDate().ToInternalValue(), i->ExpiryDate().ToInternalValue(),
         i->LastAccessDate().ToInternalValue(), i->IsSecure(), i->IsHttpOnly(),
-        i->IsFirstPartyOnly(), i->Priority());
+        i->IsSameSite(), i->Priority());
     env->SetObjectArrayElement(joa.obj(), index++, java_cookie.obj());
   }
 
   Java_CookiesFetcher_onCookieFetchFinished(env, jobject_.obj(), joa.obj());
 
   // Give up the reference.
   jobject_.Reset();
 }
 
 void CookiesFetcher::RestoreCookies(JNIEnv* env,
                                     const JavaParamRef<jobject>& obj,
                                     const JavaParamRef<jstring>& url,
                                     const JavaParamRef<jstring>& name,
                                     const JavaParamRef<jstring>& value,
                                     const JavaParamRef<jstring>& domain,
                                     const JavaParamRef<jstring>& path,
                                     int64_t creation,
                                     int64_t expiration,
                                     int64_t last_access,
                                     bool secure,
                                     bool httponly,
-                                    bool firstpartyonly,
+                                    bool samesite,

[mmenke, 2016/01/25 18:47:10]

same_site (x2)

[Mike West, 2016/01/26 11:05:45]

Done (x2)

                                     int priority) {
   Profile* profile = ProfileManager::GetPrimaryUserProfile();
   if (!profile->HasOffTheRecordProfile()) {
       return; // Don't create it. There is nothing to do.
   }
   profile = profile->GetOffTheRecordProfile();
 
   scoped_refptr<net::URLRequestContextGetter> getter(
       profile->GetRequestContext());
 
   net::CanonicalCookie cookie(
       GURL(base::android::ConvertJavaStringToUTF8(env, url)),
       base::android::ConvertJavaStringToUTF8(env, name),
       base::android::ConvertJavaStringToUTF8(env, value),
       base::android::ConvertJavaStringToUTF8(env, domain),
       base::android::ConvertJavaStringToUTF8(env, path),
       base::Time::FromInternalValue(creation),
       base::Time::FromInternalValue(expiration),
       base::Time::FromInternalValue(last_access), secure, httponly,
-      firstpartyonly, static_cast<net::CookiePriority>(priority));
+      samesite, static_cast<net::CookiePriority>(priority));
 
   // The rest must be done from the IO thread.
   content::BrowserThread::PostTask(
       content::BrowserThread::IO,
       FROM_HERE,
       base::Bind(&CookiesFetcher::RestoreToCookieJarInternal,
                  base::Unretained(this),
                  getter,
                  cookie));
 }
@@ skipping 15 matching lines @@
 
   // TODO(estark): Remove kEnableExperimentalWebPlatformFeatures check
   // when we decide whether to ship cookie
   // prefixes. https://crbug.com/541511
   bool experimental_features_enabled =
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableExperimentalWebPlatformFeatures);
   monster->SetCookieWithDetailsAsync(
       cookie.Source(), cookie.Name(), cookie.Value(), cookie.Domain(),
       cookie.Path(), cookie.ExpiryDate(), cookie.IsSecure(),
-      cookie.IsHttpOnly(), cookie.IsFirstPartyOnly(),
+      cookie.IsHttpOnly(), cookie.IsSameSite(),
       experimental_features_enabled, experimental_features_enabled,
       cookie.Priority(), cb);
 }
 
 // JNI functions
 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   return reinterpret_cast<intptr_t>(new CookiesFetcher(env, obj, 0));
 }
 
 // Register native methods
 bool RegisterCookiesFetcher(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }