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

chrome/browser/net/connection_tester.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/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
@@ skipping 114 matching lines @@
     session_params.proxy_service = proxy_service();
     session_params.ssl_config_service = ssl_config_service();
     session_params.http_auth_handler_factory = http_auth_handler_factory();
     session_params.http_server_properties = http_server_properties();
     session_params.net_log = net_log;
     scoped_refptr<net::HttpNetworkSession> network_session(
         new net::HttpNetworkSession(session_params));
     storage_.set_http_transaction_factory(new net::HttpCache(
         network_session.get(), net::HttpCache::DefaultBackend::InMemory(0)));
     // In-memory cookie store.
-    storage_.set_cookie_store(content::CreateInMemoryCookieStore(NULL));
+    storage_.set_cookie_store(
+        content::CreateCookieStore(content::CookieStoreConfig()));
 
     return net::OK;
   }
 
  private:
   // Creates a host resolver for |experiment|. On success returns net::OK and
   // fills |host_resolver| with a new pointer. Otherwise returns a network
   // error code.
   int CreateHostResolver(
       ConnectionTester::HostResolverExperiment experiment,
@@ skipping 387 matching lines @@
 
   // Notify the delegate of completion.
   delegate_->OnCompletedConnectionTestExperiment(current, result);
 
   if (remaining_experiments_.empty()) {
     delegate_->OnCompletedConnectionTestSuite();
   } else {
     StartNextExperiment();
   }
 }