Remove TestingProfile::GetCookieStore()

This method was only used by the BrowsingDataCookieHelper unit tests,
which this change converts to using the network::mojom::CookieManager
interface.

Bug: 721395
Change-Id: Ia4f5a54221d0ce902a42e8f910230ad0d732b7ee
Reviewed-on: https://chromium-review.googlesource.com/1236289Reviewed-by: Joshua Bell <jsbell@chromium.org>
Commit-Queue: Reilly Grant <reillyg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#593231}

chrome/browser/browsing_data/browsing_data_cookie_helper_unittest.cc

@@ -8,10 +8,11 @@
 #include "base/run_loop.h"
 #include "base/time/time.h"
 #include "chrome/test/base/testing_profile.h"
+#include "content/public/browser/storage_partition.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_options.h"
-#include "net/url_request/url_request_context_getter.h"
+#include "services/network/public/mojom/cookie_manager.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
@@ -109,23 +110,39 @@ class BrowsingDataCookieHelperTest : public testing::Test {
   }
 
   void CreateCookiesForTest() {
-    net::CookieStore* cookie_store = testing_profile_->GetCookieStore();
-    cookie_store->SetCookieWithOptionsAsync(
-        GURL("http://www.google.com"), "A=1", net::CookieOptions(),
-        net::CookieMonster::SetCookiesCallback());
-    cookie_store->SetCookieWithOptionsAsync(
-        GURL("http://www.gmail.google.com"), "B=1", net::CookieOptions(),
-        net::CookieMonster::SetCookiesCallback());
+    auto cookie1 =
+        net::CanonicalCookie::Create(GURL("http://www.google.com"), "A=1",
+                                     base::Time::Now(), net::CookieOptions());
+    auto cookie2 =
+        net::CanonicalCookie::Create(GURL("http://www.gmail.google.com"), "B=1",
+                                     base::Time::Now(), net::CookieOptions());
+
+    network::mojom::CookieManager* cookie_manager =
+        storage_partition()->GetCookieManagerForBrowserProcess();
+    cookie_manager->SetCanonicalCookie(*cookie1, true /* secure_source */,
+                                       false /* modify_http_only */,
+                                       base::DoNothing());
+    cookie_manager->SetCanonicalCookie(*cookie2, true /* secure_source */,
+                                       false /* modify_http_only */,
+                                       base::DoNothing());
   }
 
   void CreateCookiesForDomainCookieTest() {
-    net::CookieStore* cookie_store = testing_profile_->GetCookieStore();
-    cookie_store->SetCookieWithOptionsAsync(
-        GURL("http://www.google.com"), "A=1", net::CookieOptions(),
-        net::CookieMonster::SetCookiesCallback());
-    cookie_store->SetCookieWithOptionsAsync(
+    auto cookie1 =
+        net::CanonicalCookie::Create(GURL("http://www.google.com"), "A=1",
+                                     base::Time::Now(), net::CookieOptions());
+    auto cookie2 = net::CanonicalCookie::Create(
         GURL("http://www.google.com"), "A=2; Domain=.www.google.com ",
-        net::CookieOptions(), net::CookieMonster::SetCookiesCallback());
+        base::Time::Now(), net::CookieOptions());
+
+    network::mojom::CookieManager* cookie_manager =
+        storage_partition()->GetCookieManagerForBrowserProcess();
+    cookie_manager->SetCanonicalCookie(*cookie1, true /* secure_source */,
+                                       false /* modify_http_only */,
+                                       base::DoNothing());
+    cookie_manager->SetCanonicalCookie(*cookie2, true /* secure_source */,
+                                       false /* modify_http_only */,
+                                       base::DoNothing());
   }
 
   void FetchCallback(const net::CookieList& cookies) {

chrome/test/base/testing_profile.cc

@@ -769,12 +769,6 @@ TestingProfile::GetExtensionSpecialStoragePolicy() {
 #endif
 }
 
-net::CookieStore* TestingProfile::GetCookieStore() {
-  if (!GetRequestContext())
-    return NULL;
-  return GetRequestContext()->GetURLRequestContext()->cookie_store();
-}
-
 void TestingProfile::CreateTestingPrefService() {
   DCHECK(!prefs_.get());
   testing_prefs_ = new sync_preferences::TestingPrefServiceSyncable();

chrome/test/base/testing_profile.h

@@ -38,7 +38,6 @@ class ZoomLevelDelegate;
 }
 
 namespace net {
-class CookieStore;
 class URLRequestContextGetter;
 }
 
@@ -309,10 +308,6 @@ class TestingProfile : public Profile {
       ExtensionSpecialStoragePolicy* extension_special_storage_policy);
 #endif
   ExtensionSpecialStoragePolicy* GetExtensionSpecialStoragePolicy() override;
-  // TODO(ajwong): Remove this API in favor of directly retrieving the
-  // CookieStore from the StoragePartition after ExtensionURLRequestContext
-  // has been removed.
-  net::CookieStore* GetCookieStore();
 
   PrefService* GetPrefs() override;
   const PrefService* GetPrefs() const override;