CookieStore: Remove reference counting.

content/browser/net/quota_policy_cookie_store.cc

 // 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 "content/browser/net/quota_policy_cookie_store.h"
 
 #include <list>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 111 matching lines @@
       session_cookie_mode(session_cookie_mode),
       storage_policy(storage_policy),
       cookie_delegate(cookie_delegate),
       crypto_delegate(nullptr) {
   CHECK(!path.empty() || session_cookie_mode == EPHEMERAL_SESSION_COOKIES);
 }
 
 CookieStoreConfig::~CookieStoreConfig() {
 }
 
-net::CookieStore* CreateCookieStore(const CookieStoreConfig& config) {
+scoped_ptr<net::CookieStore> CreateCookieStore(
+    const CookieStoreConfig& config) {
   // TODO(bcwhite): Remove ScopedTracker below once crbug.com/483686 is fixed.
   tracked_objects::ScopedTracker tracking_profile(
       FROM_HERE_WITH_EXPLICIT_FUNCTION("483686 content::CreateCookieStore"));
 
-  net::CookieMonster* cookie_monster = nullptr;
+  scoped_ptr<net::CookieMonster> cookie_monster;
 
   if (config.path.empty()) {
     // Empty path means in-memory store.
-    cookie_monster = new net::CookieMonster(nullptr,
-                                            config.cookie_delegate.get());
+    cookie_monster.reset(
+        new net::CookieMonster(nullptr, config.cookie_delegate.get()));
   } else {
     scoped_refptr<base::SequencedTaskRunner> client_task_runner =
         config.client_task_runner;
     scoped_refptr<base::SequencedTaskRunner> background_task_runner =
         config.background_task_runner;
 
     if (!client_task_runner.get()) {
       client_task_runner =
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO);
     }
@@ skipping 11 matching lines @@
             background_task_runner,
             (config.session_cookie_mode ==
              CookieStoreConfig::RESTORED_SESSION_COOKIES),
             config.crypto_delegate));
 
     QuotaPolicyCookieStore* persistent_store =
         new QuotaPolicyCookieStore(
             sqlite_store.get(),
             config.storage_policy.get());
 
-    cookie_monster =
-        new net::CookieMonster(persistent_store, config.cookie_delegate.get());
+    cookie_monster.reset(
+        new net::CookieMonster(persistent_store, config.cookie_delegate.get()));
     if ((config.session_cookie_mode ==
          CookieStoreConfig::PERSISTANT_SESSION_COOKIES) ||
         (config.session_cookie_mode ==
          CookieStoreConfig::RESTORED_SESSION_COOKIES)) {
       cookie_monster->SetPersistSessionCookies(true);
     }
   }
 
   if (!config.cookieable_schemes.empty())
     cookie_monster->SetCookieableSchemes(config.cookieable_schemes);
 
-  return cookie_monster;
+  return make_scoped_ptr(cookie_monster.release());

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

nit: Is there something I'm not understanding about scoped_ptr<> semantics?  I
thought if the scoped pointer was going out of scope at the point of transfer,
no explicit transfer was needed, i.e. "return cookie_monster;" should work here.
 Even if it doesn't, I'd think "return std::move(cookie_monster);" would be more
idiomatic in the new chrome world.  Am I missing something?

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

cookie_monster is a scoped_ptr<CookieMonster>, while we're returning a
scoped_ptr<CookieStore>.  "return cookie_monster" doesn't handle the conversion.
 std::move does, but I think it generates a clang error.  I'll try it, and see
what the bots think.

[mmenke, 2016/03/01 01:40:47]

Looks like clang is smart enough to know when std::move is converting between
types and when it's not.  I'll fix all instances of this and upload a new patch
tomorrow.

 }
 
 }  // namespace content