Add CookieStoreConfig to unify API for in-memory and persistent CookieStore Creation.

components/autofill/content/browser/wallet/wallet_signin_helper_unittest.cc

 // Copyright 2013 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 "components/autofill/content/browser/wallet/wallet_signin_helper.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
@@ skipping 109 matching lines @@
 
 TEST_F(WalletSigninHelperTest, PassiveSigninFailedSigninNo) {
   EXPECT_CALL(mock_delegate_, OnPassiveSigninFailure(_));
   signin_helper_->StartPassiveSignin(0);
   MockFailedPassiveSignInResponseNo();
 }
 
 TEST_F(WalletSigninHelperTest, GetWalletCookieValueWhenPresent) {
   EXPECT_CALL(mock_delegate_, OnDidFetchWalletCookieValue("gdToken"));
   net::CookieMonster* cookie_monster =
-      content::CreateInMemoryCookieStore(NULL)->GetCookieMonster();
+      content::CreateCookieStore(content::CookieStoreConfig())->
+          GetCookieMonster();
   net::CookieOptions httponly_options;
   httponly_options.set_include_httponly();
   scoped_ptr<net::CanonicalCookie> cookie(
       net::CanonicalCookie::Create(GetPassiveAuthUrl(0).GetWithEmptyPath(),
                                    "gdToken=gdToken; HttpOnly",
                                    base::Time::Now(),
                                    httponly_options));
 
   net::CookieList cookie_list;
   cookie_list.push_back(*cookie);
   cookie_monster->InitializeFrom(cookie_list);
   browser_context_.GetRequestContext()->GetURLRequestContext()
       ->set_cookie_store(cookie_monster);
   signin_helper_->StartWalletCookieValueFetch();
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(WalletSigninHelperTest, GetWalletCookieValueWhenMissing) {
   EXPECT_CALL(mock_delegate_, OnDidFetchWalletCookieValue(std::string()));
   net::CookieMonster* cookie_monster =
-      content::CreateInMemoryCookieStore(NULL)->GetCookieMonster();
+      content::CreateCookieStore(content::CookieStoreConfig())->
+          GetCookieMonster();
   net::CookieOptions httponly_options;
   httponly_options.set_include_httponly();
   scoped_ptr<net::CanonicalCookie> cookie(
       net::CanonicalCookie::Create(GetPassiveAuthUrl(0).GetWithEmptyPath(),
                                    "fake_cookie=monkeys; HttpOnly",
                                    base::Time::Now(),
                                    httponly_options));
 
   net::CookieList cookie_list;
   cookie_list.push_back(*cookie);
   cookie_monster->InitializeFrom(cookie_list);
   browser_context_.GetRequestContext()->GetURLRequestContext()
       ->set_cookie_store(cookie_monster);
   signin_helper_->StartWalletCookieValueFetch();
   base::RunLoop().RunUntilIdle();
 }
 
 // TODO(aruslan): http://crbug.com/188317 Need more tests.
 
 }  // namespace wallet
 }  // namespace autofill