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

chrome/browser/net/connection_tester_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/net/connection_tester.h"
 
 #include "base/prefs/testing_pref_service.h"
+#include "content/public/browser/cookie_store_factory.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/browser/cookie_store_factory.h"
 #include "net/cert/mock_cert_verifier.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/ftp/ftp_network_layer.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_server_properties_impl.h"
 #include "net/http/transport_security_state.h"
@@ skipping 123 matching lines @@
     session_params.http_server_properties =
         http_server_properties_impl_.GetWeakPtr();
     scoped_refptr<net::HttpNetworkSession> network_session(
         new net::HttpNetworkSession(session_params));
     http_transaction_factory_.reset(
         new net::HttpNetworkLayer(network_session.get()));
     proxy_script_fetcher_context_->set_http_transaction_factory(
         http_transaction_factory_.get());
     // In-memory cookie store.
     proxy_script_fetcher_context_->set_cookie_store(
-        content::CreateInMemoryCookieStore(NULL));
+        content::CreateCookieStore(content::CookieStoreConfig()));
   }
 };
 
 TEST_F(ConnectionTesterTest, RunAllTests) {
   ASSERT_TRUE(test_server_.Start());
 
   ConnectionTester tester(&test_delegate_,
                           proxy_script_fetcher_context_.get(),
                           NULL);
 
@@ skipping 47 matching lines @@
   // net::ClientSocketPoolBaseHelper, since the "Group" holds a pointer
   // |backup_task| that it will try to deref during the destructor, but
   // depending on the order that pending tasks were deleted in, it might
   // already be invalid! See http://crbug.com/43291.
   base::MessageLoop::current()->PostTask(FROM_HERE,
                                          base::MessageLoop::QuitClosure());
   base::MessageLoop::current()->Run();
 }
 
 }  // namespace