Injecting an NSHTTPCookieStorage dependency into CookieStoreIOS

ios/crnet/crnet_environment.mm

 // Copyright 2014 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 "ios/crnet/crnet_environment.h"
 
 #import <Foundation/Foundation.h>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
@@ skipping 444 matching lines @@
   //                See https://crbug.com/523858.
   net::HttpNetworkSession* http_network_session =
       new net::HttpNetworkSession(params);
   net::HttpCache* main_cache = new net::HttpCache(
       http_network_session, main_backend.Pass(),
       true /* set_up_quic_server_info */);
   main_context_->set_http_transaction_factory(main_cache);
 
   // Cookies
   scoped_refptr<net::CookieStore> cookie_store =
-      net::CookieStoreIOS::CreateCookieStoreFromNSHTTPCookieStorage();
+  net::CookieStoreIOS::CreateCookieStore(
+      [NSHTTPCookieStorage sharedHTTPCookieStorage]);
   main_context_->set_cookie_store(cookie_store.get());
 
   net::URLRequestJobFactoryImpl* job_factory =
       new net::URLRequestJobFactoryImpl;
   job_factory->SetProtocolHandler(
       "data", make_scoped_ptr(new net::DataProtocolHandler));
   job_factory->SetProtocolHandler(
       "file", make_scoped_ptr(
                   new net::FileProtocolHandler(file_thread_->task_runner())));
   main_context_->set_job_factory(job_factory);
@@ skipping 10 matching lines @@
 
   return user_agent_settings->GetUserAgent();
 }
 
 void CrNetEnvironment::ClearCache(ClearCacheCallback callback) {
   PostToNetworkThread(
       FROM_HERE,
       base::Bind(&net::ClearHttpCache, main_context_getter_,
                  network_io_thread_->task_runner(), base::BindBlock(callback)));
 }