CookieStore: Remove reference counting.

chrome/browser/profiles/profile_impl_io_data.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/profiles/profile_impl_io_data.h"
 
 #include <set>
 #include <string>
 #include <utility>
 
@@ skipping 42 matching lines @@
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cookie_store_factory.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/storage_partition.h"
 #include "extensions/browser/extension_protocols.h"
 #include "extensions/common/constants.h"
 #include "net/base/cache_type.h"
 #include "net/base/sdch_manager.h"
+#include "net/cookies/cookie_store.h"
 #include "net/ftp/ftp_network_layer.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/url_request/url_request_intercepting_job_factory.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "storage/browser/quota/special_storage_policy.h"
 
@@ skipping 403 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;
+  net::ChannelIDService* channel_id_service = nullptr;
 
   // Set up cookie store.
-  if (!cookie_store.get()) {

[Randy Smith (Not in Mondays), 2016/02/29 22:37:45]

I know the code's going away, but: Huh?  Won't this always be true?

[mmenke, 2016/02/29 23:00:29]

Yes, which is exactly why I removed it.  :)  I suspect it was copied from the
code to create a cookie store below, which has a similar check (Which I also
remove in this CL), which can actually be false.

-    DCHECK(!lazy_params_->cookie_path.empty());
+  DCHECK(!lazy_params_->cookie_path.empty());
 
-    content::CookieStoreConfig cookie_config(
-        lazy_params_->cookie_path,
-        lazy_params_->session_cookie_mode,
-        lazy_params_->special_storage_policy.get(),
-        profile_params->cookie_monster_delegate.get());
-    cookie_config.crypto_delegate = cookie_config::GetCookieCryptoDelegate();
-    cookie_store = content::CreateCookieStore(cookie_config);
-  }
+  content::CookieStoreConfig cookie_config(
+      lazy_params_->cookie_path, lazy_params_->session_cookie_mode,
+      lazy_params_->special_storage_policy.get(),
+      profile_params->cookie_monster_delegate.get());
+  cookie_config.crypto_delegate = cookie_config::GetCookieCryptoDelegate();
+  main_cookie_store_ = content::CreateCookieStore(cookie_config);
 
-  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<QuotaPolicyChannelIDStore> channel_id_db =
         new QuotaPolicyChannelIDStore(
             lazy_params_->channel_id_path,
             BrowserThread::GetBlockingPool()->GetSequencedTaskRunner(
                 base::SequencedWorkerPool::GetSequenceToken()),
@@ skipping 71 matching lines @@
 
   extensions_context->set_net_log(io_thread->net_log());
 
   content::CookieStoreConfig cookie_config(
       lazy_params_->extensions_cookie_path,
       lazy_params_->session_cookie_mode,
       NULL, NULL);
   cookie_config.crypto_delegate = cookie_config::GetCookieCryptoDelegate();
   // Enable cookies for chrome-extension URLs.
   cookie_config.cookieable_schemes.push_back(extensions::kExtensionScheme);
-  net::CookieStore* extensions_cookie_store =
-      content::CreateCookieStore(cookie_config);
-  extensions_context->set_cookie_store(extensions_cookie_store);
+  extensions_cookie_store_ = content::CreateCookieStore(cookie_config);
+  extensions_context->set_cookie_store(extensions_cookie_store_.get());
 
   scoped_ptr<net::URLRequestJobFactoryImpl> extensions_job_factory(
       new net::URLRequestJobFactoryImpl());
   // TODO(shalev): The extensions_job_factory has a NULL NetworkDelegate.
   // Without a network_delegate, this protocol handler will never
   // handle file: requests, but as a side effect it makes
   // job_factory::IsHandledProtocol return true, which prevents attempts to
   // handle the protocol externally. We pass NULL in to
   // SetUpJobFactory() to get this effect.
   extensions_job_factory_ = SetUpJobFactoryDefaults(
@@ skipping 30 matching lines @@
     app_backend.reset(new net::HttpCache::DefaultBackend(
         net::DISK_CACHE,
         ChooseCacheBackendType(),
         cache_path,
         app_cache_max_size_,
         BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE)));
   }
   scoped_ptr<net::HttpCache> app_http_cache =
       CreateHttpFactory(http_network_session_.get(), std::move(app_backend));
 
-  scoped_refptr<net::CookieStore> cookie_store = NULL;
+  scoped_ptr<net::CookieStore> cookie_store;
   if (partition_descriptor.in_memory) {
     cookie_store = content::CreateCookieStore(content::CookieStoreConfig());
-  }
-
-  // Use an app-specific cookie store.
-  if (!cookie_store.get()) {
+  } else {
+    // Use an app-specific cookie store.
     DCHECK(!cookie_path.empty());
 
     // TODO(creis): We should have a cookie delegate for notifying the cookie
     // extensions API, but we need to update it to understand isolated apps
     // first.
     content::CookieStoreConfig cookie_config(
-        cookie_path,
-        content::CookieStoreConfig::EPHEMERAL_SESSION_COOKIES,
-        NULL, NULL);
+        cookie_path, content::CookieStoreConfig::EPHEMERAL_SESSION_COOKIES,
+        nullptr, nullptr);
     cookie_config.crypto_delegate = cookie_config::GetCookieCryptoDelegate();
     cookie_store = content::CreateCookieStore(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());
   InstallProtocolHandlers(job_factory.get(), protocol_handlers);
   // The data reduction proxy interceptor should be as close to the network
   // as possible.
   request_interceptors.insert(
       request_interceptors.begin(),
       data_reduction_proxy_io_data()->CreateInterceptor().release());
@@ skipping 93 matching lines @@
     const base::Closure& completion) {
   DCHECK_CURRENTLY_ON(BrowserThread::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);
 }