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

chrome/browser/android/cookies/cookies_fetcher.cc

Index: chrome/browser/android/cookies/cookies_fetcher.cc
diff --git a/chrome/browser/android/cookies/cookies_fetcher.cc b/chrome/browser/android/cookies/cookies_fetcher.cc
index c98ad30781764650d73ca6800dc91bbecd6bacda..f6cbff63ed12cd2b98a3754a2c2b04fd76ddd385 100644
--- a/chrome/browser/android/cookies/cookies_fetcher.cc
+++ b/chrome/browser/android/cookies/cookies_fetcher.cc
@@ -88,7 +88,7 @@ void CookiesFetcher::OnCookiesFetchFinished(const net::CookieList& cookies) {
         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());
   }
 
@@ -110,7 +110,7 @@ void CookiesFetcher::RestoreCookies(JNIEnv* env,
                                     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()) {
@@ -130,7 +130,7 @@ void CookiesFetcher::RestoreCookies(JNIEnv* env,
       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(
@@ -166,7 +166,7 @@ void CookiesFetcher::RestoreToCookieJarInternal(
   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);
 }