Remove stl_util's deletion functions from net/cookies/ and net/extras/.

net/extras/sqlite/sqlite_persistent_cookie_store_perftest.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/extras/sqlite/sqlite_persistent_cookie_store.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 21 matching lines @@
 
 class SQLitePersistentCookieStorePerfTest : public testing::Test {
  public:
   SQLitePersistentCookieStorePerfTest()
       : pool_owner_(new base::SequencedWorkerPoolOwner(2, "SetupPool")),
         loaded_event_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
                       base::WaitableEvent::InitialState::NOT_SIGNALED),
         key_loaded_event_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
                           base::WaitableEvent::InitialState::NOT_SIGNALED) {}
 
-  void OnLoaded(const std::vector<CanonicalCookie*>& cookies) {
-    cookies_ = cookies;
+  void OnLoaded(std::vector<std::unique_ptr<CanonicalCookie>> cookies) {
+    cookies_.swap(cookies);
     loaded_event_.Signal();
   }
 
-  void OnKeyLoaded(const std::vector<CanonicalCookie*>& cookies) {
-    cookies_ = cookies;
+  void OnKeyLoaded(std::vector<std::unique_ptr<CanonicalCookie>> cookies) {
+    cookies_.swap(cookies);
     key_loaded_event_.Signal();
   }
 
   void Load() {
     store_->Load(base::Bind(&SQLitePersistentCookieStorePerfTest::OnLoaded,
                             base::Unretained(this)));
     loaded_event_.Wait();
   }
 
   scoped_refptr<base::SequencedTaskRunner> background_task_runner() {
@@ skipping 43 matching lines @@
 
   void TearDown() override {
     store_ = NULL;
   }
 
  protected:
   base::MessageLoop main_loop_;
   std::unique_ptr<base::SequencedWorkerPoolOwner> pool_owner_;
   base::WaitableEvent loaded_event_;
   base::WaitableEvent key_loaded_event_;
-  std::vector<CanonicalCookie*> cookies_;
+  std::vector<std::unique_ptr<CanonicalCookie>> cookies_;
   base::ScopedTempDir temp_dir_;
   scoped_refptr<SQLitePersistentCookieStore> store_;
 };
 
-// Test the performance of priority load of cookies for a specfic domain key
+// Test the performance of priority load of cookies for a specific domain key
 TEST_F(SQLitePersistentCookieStorePerfTest, TestLoadForKeyPerformance) {
   for (int domain_num = 0; domain_num < 3; ++domain_num) {
     std::string domain_name(base::StringPrintf("domain_%d.com", domain_num));
     base::PerfTimeLogger timer(
         ("Load cookies for the eTLD+1 " + domain_name).c_str());
     store_->LoadCookiesForKey(
         domain_name,
         base::Bind(&SQLitePersistentCookieStorePerfTest::OnKeyLoaded,
                    base::Unretained(this)));
     key_loaded_event_.Wait();
     timer.Done();
 
     ASSERT_EQ(50U, cookies_.size());
   }
 }
 
 // Test the performance of load
 TEST_F(SQLitePersistentCookieStorePerfTest, TestLoadPerformance) {
   base::PerfTimeLogger timer("Load all cookies");
   Load();
   timer.Done();
 
   ASSERT_EQ(15000U, cookies_.size());
 }
 
 }  // namespace net