CookieStore: Remove reference counting.

net/url_request/url_request_context_builder.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 "net/url_request/url_request_context_builder.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 239 matching lines @@
     scoped_ptr<CertVerifier> cert_verifier) {
   cert_verifier_ = std::move(cert_verifier);
 }
 
 void URLRequestContextBuilder::SetInterceptors(
     std::vector<scoped_ptr<URLRequestInterceptor>> url_request_interceptors) {
   url_request_interceptors_ = std::move(url_request_interceptors);
 }
 
 void URLRequestContextBuilder::SetCookieAndChannelIdStores(
-      const scoped_refptr<CookieStore>& cookie_store,
-      scoped_ptr<ChannelIDService> channel_id_service) {
+    scoped_ptr<CookieStore> cookie_store,
+    scoped_ptr<ChannelIDService> channel_id_service) {
   DCHECK(cookie_store);
-  cookie_store_ = cookie_store;
+  cookie_store_ = std::move(cookie_store);
   channel_id_service_ = std::move(channel_id_service);
 }
 
 void URLRequestContextBuilder::SetFileTaskRunner(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) {
   file_task_runner_ = task_runner;
 }
 
 void URLRequestContextBuilder::SetProtocolHandler(
     const std::string& scheme,
@@ skipping 57 matching lines @@
   storage->set_ssl_config_service(new SSLConfigServiceDefaults);
 
   if (!http_auth_handler_factory_) {
     http_auth_handler_factory_ =
         HttpAuthHandlerRegistryFactory::CreateDefault(context->host_resolver());
   }
 
   storage->set_http_auth_handler_factory(std::move(http_auth_handler_factory_));
 
   if (cookie_store_) {
-    storage->set_cookie_store(cookie_store_.get());
+    storage->set_cookie_store(std::move(cookie_store_));
     storage->set_channel_id_service(std::move(channel_id_service_));
   } else {
-    storage->set_cookie_store(new CookieMonster(NULL, NULL));
+    storage->set_cookie_store(
+        make_scoped_ptr(new CookieMonster(nullptr, nullptr)));
     // TODO(mmenke):  This always creates a file thread, even when it ends up
     // not being used.  Consider lazily creating the thread.
     storage->set_channel_id_service(make_scoped_ptr(new ChannelIDService(
         new DefaultChannelIDStore(NULL), context->GetFileTaskRunner())));
   }
 
   if (sdch_enabled_) {
     storage->set_sdch_manager(scoped_ptr<net::SdchManager>(new SdchManager()));
   }
 
@@ skipping 150 matching lines @@
     }
     url_request_interceptors_.clear();
   }
   storage->set_job_factory(std::move(top_job_factory));
   // TODO(willchan): Support sdch.
 
   return std::move(context);
 }
 
 }  // namespace net