Promote SetCookieWithDetailsAsync from CookieMonster to CookieStore.

This means that more classes can just use the CookieStore
interface, rather than depending on a particular implementation of it.

Also remove an argument from SetCookieWithDetailsAsync that was no
longer being used, and add an argument to set the creation time, so
that a followup CL can replace ImportCookies calls with
SetCookieWithDetailsAsync.

TBR=tedchoc@chromium.org
BUG=579653

Review URL: https://codereview.chromium.org/1644163002

Cr-Commit-Position: refs/heads/master@{#372883}

1 files changed, 4 insertions, 8 deletions

diff --git a/chrome/browser/android/cookies/cookies_fetcher.cc b/chrome/browser/android/cookies/cookies_fetcher.cc
index abc62c6..0a65042 100644
--- a/chrome/browser/android/cookies/cookies_fetcher.cc
+++ b/chrome/browser/android/cookies/cookies_fetcher.cc
@@ -12,7 +12,6 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.h"
 #include "jni/CookiesFetcher_jni.h"
-#include "net/cookies/cookie_monster.h"
 #include "net/cookies/cookie_store.h"
 #include "net/url_request/url_request_context.h"
 
@@ -63,9 +62,7 @@ void CookiesFetcher::PersistCookiesInternal(
     return;
   }
 
-  net::CookieMonster* monster = store->GetCookieMonster();
-
-  monster->GetAllCookiesAsync(base::Bind(
+  store->GetAllCookiesAsync(base::Bind(
       &CookiesFetcher::OnCookiesFetchFinished, base::Unretained(this)));
 }
 
@@ -154,7 +151,6 @@ void CookiesFetcher::RestoreToCookieJarInternal(
       return;
   }
 
-  net::CookieMonster* monster = store->GetCookieMonster();
   base::Callback<void(bool success)> cb;
 
   // TODO(estark): Remove kEnableExperimentalWebPlatformFeatures check
@@ -163,11 +159,11 @@ void CookiesFetcher::RestoreToCookieJarInternal(
   bool experimental_features_enabled =
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableExperimentalWebPlatformFeatures);
-  monster->SetCookieWithDetailsAsync(
+  store->SetCookieWithDetailsAsync(
       cookie.Source(), cookie.Name(), cookie.Value(), cookie.Domain(),
-      cookie.Path(), cookie.ExpiryDate(), cookie.IsSecure(),
+      cookie.Path(), base::Time(), cookie.ExpiryDate(), cookie.IsSecure(),
       cookie.IsHttpOnly(), cookie.IsSameSite(), experimental_features_enabled,
-      experimental_features_enabled, cookie.Priority(), cb);
+      cookie.Priority(), cb);
 }
 
 // JNI functions