CookieStore: Remove reference counting.

chrome/browser/browsing_data/browsing_data_remover_unittest.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/browsing_data/browsing_data_remover.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <set>
@@ skipping 358 matching lines @@
         new content::MessageLoopRunner;
     quit_closure_ = message_loop_runner->QuitClosure();
     cookie_store_->SetCookieWithOptionsAsync(
         kOrigin1, "A=1", net::CookieOptions(),
         base::Bind(&RemoveCookieTester::SetCookieCallback,
                    base::Unretained(this)));
     message_loop_runner->Run();
   }
 
  protected:
-  void SetMonster(net::CookieStore* monster) {
-    cookie_store_ = monster;
+  void SetMonster(scoped_ptr<net::CookieStore> monster) {
+    cookie_store_ = std::move(monster);
   }
 
  private:
   void GetCookieCallback(const std::string& cookies) {
     if (cookies == "A=1") {
       get_cookie_success_ = true;
     } else {
       EXPECT_EQ("", cookies);
       get_cookie_success_ = false;
     }
     quit_closure_.Run();
   }
 
   void SetCookieCallback(bool result) {
     ASSERT_TRUE(result);
     quit_closure_.Run();
   }
 
   bool get_cookie_success_ = false;
   base::Closure quit_closure_;
-  net::CookieStore* cookie_store_ = nullptr;
+  scoped_ptr<net::CookieStore> cookie_store_;
 
   DISALLOW_COPY_AND_ASSIGN(RemoveCookieTester);
 };
 
 class RemoveSafeBrowsingCookieTester : public RemoveCookieTester {
  public:
   RemoveSafeBrowsingCookieTester()
       : browser_process_(TestingBrowserProcess::GetGlobal()) {
     scoped_refptr<safe_browsing::SafeBrowsingService> sb_service =
         safe_browsing::SafeBrowsingService::CreateSafeBrowsingService();
     browser_process_->SetSafeBrowsingService(sb_service.get());
     sb_service->Initialize();
     base::MessageLoop::current()->RunUntilIdle();
 
     // Create a cookiemonster that does not have persistant storage, and replace
     // the SafeBrowsingService created one with it.
-    net::CookieStore* monster =
+    scoped_ptr<net::CookieStore> monster =
         content::CreateCookieStore(content::CookieStoreConfig());
-    sb_service->url_request_context()->GetURLRequestContext()->
-        set_cookie_store(monster);
-    SetMonster(monster);
+    sb_service->url_request_context()->GetURLRequestContext()->set_cookie_store(
+        monster.get());
+    SetMonster(std::move(monster));

[Randy Smith (Not in Mondays), 2016/03/01 20:48:43]

You look to be changing the deletion semantics of the cookie monster here; IIUC,
originally it leaked.  I don't offhand see why we'd expect
RemoveSafeBrowsingCookieTester to outlive the URLRequestContext off the
safebrowsing service.  Maybe save the original pointer and put it back in the
destructor?  Or at least set it to null in the destructor, to make it more
obvious if we trip over a lifetime issue?

[mmenke, 2016/03/01 22:44:45]

Hrm...Actually, I'm not sure we even need to create a cookie store here. 
Safebrowsing already makes its own store.  I'll try removing it, and see what
happens.

   }
 
   virtual ~RemoveSafeBrowsingCookieTester() {
     browser_process_->safe_browsing_service()->ShutDown();
     base::MessageLoop::current()->RunUntilIdle();
     browser_process_->SetSafeBrowsingService(nullptr);
   }
 
  private:
   TestingBrowserProcess* browser_process_;
@@ skipping 1837 matching lines @@
 TEST_F(BrowsingDataRemoverTest, RemovePasswordsByOrigin) {
   RemovePasswordsTester tester(GetProfile());
   const url::Origin expectedOrigin(kOrigin1);
 
   EXPECT_CALL(*tester.store(),
               RemoveLoginsByOriginAndTimeImpl(SameOrigin(expectedOrigin), _, _))
       .WillOnce(Return(password_manager::PasswordStoreChangeList()));
   BlockUntilOriginDataRemoved(BrowsingDataRemover::EVERYTHING,
                               BrowsingDataRemover::REMOVE_PASSWORDS, kOrigin1);
 }