CookieStore: Remove reference counting.

ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.mm

 // Copyright 2015 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/chrome/browser/browser_state/chrome_browser_state_impl_io_data.h"
 
 #include <set>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 14 matching lines @@
 #include "ios/chrome/browser/ios_chrome_io_thread.h"
 #include "ios/chrome/browser/net/cookie_util.h"
 #include "ios/chrome/browser/net/http_server_properties_manager_factory.h"
 #include "ios/chrome/browser/net/ios_chrome_network_delegate.h"
 #include "ios/chrome/browser/net/ios_chrome_url_request_context_getter.h"
 #include "ios/chrome/browser/pref_names.h"
 #include "ios/net/cookies/cookie_store_ios.h"
 #include "ios/web/public/web_thread.h"
 #include "net/base/cache_type.h"
 #include "net/base/sdch_manager.h"
+#include "net/cookies/cookie_store.h"
 #include "net/extras/sqlite/sqlite_channel_id_store.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_server_properties_manager.h"
 #include "net/sdch/sdch_owner.h"
 #include "net/ssl/channel_id_service.h"
 #include "net/ssl/default_channel_id_store.h"
 #include "net/url_request/url_request_intercepting_job_factory.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 
@@ skipping 287 matching lines @@
 
   main_context->set_host_resolver(io_thread_globals->host_resolver.get());
 
   main_context->set_http_auth_handler_factory(
       io_thread_globals->http_auth_handler_factory.get());
 
   main_context->set_proxy_service(proxy_service());
   main_context->set_backoff_manager(
       io_thread_globals->url_request_backoff_manager.get());
 
-  scoped_refptr<net::CookieStore> cookie_store = NULL;
   net::ChannelIDService* channel_id_service = NULL;
 
-  // Set up cookie store.
-  if (!cookie_store.get()) {
-    DCHECK(!lazy_params_->cookie_path.empty());
-    cookie_util::CookieStoreConfig ios_cookie_config(
-        lazy_params_->cookie_path,
-        cookie_util::CookieStoreConfig::RESTORED_SESSION_COOKIES,
-        cookie_util::CookieStoreConfig::COOKIE_STORE_IOS,
-        cookie_config::GetCookieCryptoDelegate());
-    cookie_store = cookie_util::CreateCookieStore(ios_cookie_config);
+  DCHECK(!lazy_params_->cookie_path.empty());
+  cookie_util::CookieStoreConfig ios_cookie_config(
+      lazy_params_->cookie_path,
+      cookie_util::CookieStoreConfig::RESTORED_SESSION_COOKIES,
+      cookie_util::CookieStoreConfig::COOKIE_STORE_IOS,
+      cookie_config::GetCookieCryptoDelegate());
+  main_cookie_store_ = cookie_util::CreateCookieStore(ios_cookie_config);
 
-    if (profile_params->path.BaseName().value() ==
-        kIOSChromeInitialBrowserState) {
-      // Enable metrics on the default profile, not secondary profiles.
-      static_cast<net::CookieStoreIOS*>(cookie_store.get())
-          ->SetMetricsEnabled();
-    }
+  if (profile_params->path.BaseName().value() ==
+      kIOSChromeInitialBrowserState) {
+    // Enable metrics on the default profile, not secondary profiles.
+    static_cast<net::CookieStoreIOS*>(main_cookie_store_.get())
+        ->SetMetricsEnabled();
   }
 
-  main_context->set_cookie_store(cookie_store.get());
+  main_context->set_cookie_store(main_cookie_store_.get());
 
   // Set up server bound cert service.
   if (!channel_id_service) {
     DCHECK(!lazy_params_->channel_id_path.empty());
 
     scoped_refptr<net::SQLiteChannelIDStore> channel_id_db =
         new net::SQLiteChannelIDStore(
             lazy_params_->channel_id_path,
             web::WebThread::GetBlockingPool()->GetSequencedTaskRunner(
                 web::WebThread::GetBlockingPool()->GetSequenceToken()));
@@ skipping 49 matching lines @@
   // Use a separate HTTP disk cache for isolated apps.
   scoped_ptr<net::HttpCache::BackendFactory> app_backend =
       net::HttpCache::DefaultBackend::InMemory(0);
   scoped_ptr<net::HttpCache> app_http_cache =
       CreateHttpFactory(http_network_session_.get(), std::move(app_backend));
 
   cookie_util::CookieStoreConfig ios_cookie_config(
       base::FilePath(),
       cookie_util::CookieStoreConfig::EPHEMERAL_SESSION_COOKIES,
       cookie_util::CookieStoreConfig::COOKIE_STORE_IOS, nullptr);
-  scoped_refptr<net::CookieStore> cookie_store =
+  scoped_ptr<net::CookieStore> cookie_store =
       cookie_util::CreateCookieStore(ios_cookie_config);
 
   // Transfer ownership of the cookies and cache to AppRequestContext.
-  context->SetCookieStore(cookie_store.get());
+  context->SetCookieStore(std::move(cookie_store));
   context->SetHttpTransactionFactory(std::move(app_http_cache));
 
   scoped_ptr<net::URLRequestJobFactoryImpl> job_factory(
       new net::URLRequestJobFactoryImpl());
   // TODO(crbug.com/592012): Delete request_interceptor and its handling if
   // it's not needed in the future.
   URLRequestInterceptorScopedVector request_interceptors;
   scoped_ptr<net::URLRequestJobFactory> top_job_factory(SetUpJobFactoryDefaults(
       std::move(job_factory), std::move(request_interceptors),
       main_context->network_delegate()));
@@ skipping 17 matching lines @@
     const base::Closure& completion) {
   DCHECK_CURRENTLY_ON(web::WebThread::IO);
   DCHECK(initialized());
 
   DCHECK(transport_security_state());
   // Completes synchronously.
   transport_security_state()->DeleteAllDynamicDataSince(time);
   DCHECK(http_server_properties_manager_);
   http_server_properties_manager_->Clear(completion);
 }