Modify CookieManager to take a URLRequestContext instead of a

CookieStore.

Change-Id: If6a77b1d8e71e9187f72735acaba6845b2de6b90
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2498132
Commit-Queue: Chris Fredrickson <cfredric@google.com>
Reviewed-by: Eric Orth <ericorth@chromium.org>
Auto-Submit: Chris Fredrickson <cfredric@google.com>
Cr-Commit-Position: refs/heads/master@{#821014}

services/network/cookie_manager.cc

@@ -18,6 +18,7 @@
 #include "net/cookies/cookie_options.h"
 #include "net/cookies/cookie_store.h"
 #include "net/cookies/cookie_util.h"
+#include "net/url_request/url_request_context.h"
 #include "services/network/cookie_access_delegate_impl.h"
 #include "services/network/session_cleanup_cookie_store.h"
 #include "url/gurl.h"
@@ -43,10 +44,10 @@ void CookieManager::ListenerRegistration::DispatchCookieStoreChange(
 }
 
 CookieManager::CookieManager(
-    net::CookieStore* cookie_store,
+    net::URLRequestContext* url_request_context,
     scoped_refptr<SessionCleanupCookieStore> session_cleanup_cookie_store,
     mojom::CookieManagerParamsPtr params)
-    : cookie_store_(cookie_store),
+    : cookie_store_(url_request_context->cookie_store()),
       session_cleanup_cookie_store_(std::move(session_cleanup_cookie_store)) {
   mojom::CookieAccessDelegateType cookie_access_delegate_type =
       mojom::CookieAccessDelegateType::USE_CONTENT_SETTINGS;

services/network/cookie_manager.h

@@ -21,6 +21,7 @@
 
 namespace net {
 class CookieStore;
+class URLRequestContext;
 }
 
 class GURL;
@@ -33,9 +34,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) CookieManager
     : public mojom::CookieManager {
  public:
   // Construct a CookieService that can serve mojo requests for the underlying
-  // cookie store.  |*cookie_store| must outlive this object.
+  // cookie store.  |url_request_context->cookie_store()| must outlive this
+  // object.
   CookieManager(
-      net::CookieStore* cookie_store,
+      net::URLRequestContext* url_request_context,
       scoped_refptr<SessionCleanupCookieStore> session_cleanup_cookie_store,
       mojom::CookieManagerParamsPtr params);
 

services/network/cookie_manager_unittest.cc

@@ -26,6 +26,7 @@
 #include "net/cookies/cookie_store_test_helpers.h"
 #include "net/cookies/cookie_util.h"
 #include "net/cookies/test_cookie_access_delegate.h"
+#include "net/url_request/url_request_context.h"
 #include "services/network/public/mojom/cookie_manager.mojom.h"
 #include "services/network/session_cleanup_cookie_store.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -243,7 +244,6 @@ class SynchronousCookieManager {
   // No need to wrap Add*Listener and CloneInterface, since their use
   // is purely async.
  private:
-
   mojom::CookieManager* cookie_service_;
   uint32_t callback_counter_;
 
@@ -340,8 +340,10 @@ class CookieManagerTest : public testing::Test {
     connection_error_seen_ = false;
     cookie_monster_ = std::make_unique<net::CookieMonster>(
         std::move(store), nullptr /* netlog */);
+    url_request_context_ = std::make_unique<net::URLRequestContext>();
+    url_request_context_->set_cookie_store(cookie_monster_.get());
     cookie_service_ = std::make_unique<CookieManager>(
-        cookie_monster_.get(), std::move(cleanup_store), nullptr);
+        url_request_context_.get(), std::move(cleanup_store), nullptr);
     cookie_service_->AddReceiver(
         cookie_service_remote_.BindNewPipeAndPassReceiver());
     service_wrapper_ = std::make_unique<SynchronousCookieManager>(
@@ -359,6 +361,7 @@ class CookieManagerTest : public testing::Test {
   bool connection_error_seen_;
 
   std::unique_ptr<net::CookieMonster> cookie_monster_;
+  std::unique_ptr<net::URLRequestContext> url_request_context_;
   std::unique_ptr<CookieManager> cookie_service_;
   mojo::Remote<mojom::CookieManager> cookie_service_remote_;
   std::unique_ptr<SynchronousCookieManager> service_wrapper_;

services/network/network_context.cc

@@ -408,8 +408,7 @@ NetworkContext::NetworkContext(
                             session_cleanup_cookie_store);
   url_request_context_ = url_request_context_owner_.url_request_context.get();
   cookie_manager_ = std::make_unique<CookieManager>(
-      url_request_context_owner_.url_request_context->cookie_store(),
-      std::move(session_cleanup_cookie_store),
+      url_request_context_, std::move(session_cleanup_cookie_store),
       std::move(params_->cookie_manager_params));
 
   network_service_->RegisterNetworkContext(this);
@@ -465,8 +464,7 @@ NetworkContext::NetworkContext(
           std::make_unique<NetworkContextApplicationStatusListener>()),
 #endif
       receiver_(this, std::move(receiver)),
-      cookie_manager_(
-          std::make_unique<CookieManager>(url_request_context->cookie_store(),
+      cookie_manager_(std::make_unique<CookieManager>(url_request_context,
                                                       nullptr,
                                                       nullptr)),
       socket_factory_(