Make //crypto factories return std::unique_ptr<>s

chrome/browser/net/quota_policy_channel_id_store_unittest.cc

 // Copyright 2014 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/net/quota_policy_channel_id_store.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ptr_util.h"

[davidben, 2016/06/23 03:09:35]

No longer used, I think.

 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "content/public/test/mock_special_storage_policy.h"
 #include "content/public/test/test_browser_thread_bundle.h"
@@ skipping 54 matching lines @@
       channel_ids_;
   base::MessageLoop loop_;
 };
 
 // Test if data is stored as expected in the QuotaPolicy database.
 TEST_F(QuotaPolicyChannelIDStoreTest, TestPersistence) {
   std::unique_ptr<crypto::ECPrivateKey> goog_key(
       crypto::ECPrivateKey::Create());
   std::unique_ptr<crypto::ECPrivateKey> foo_key(crypto::ECPrivateKey::Create());
   store_->AddChannelID(net::DefaultChannelIDStore::ChannelID(
-      "google.com", base::Time::FromInternalValue(1),
-      base::WrapUnique(goog_key->Copy())));
+      "google.com", base::Time::FromInternalValue(1), goog_key->Copy()));
   store_->AddChannelID(net::DefaultChannelIDStore::ChannelID(
-      "foo.com", base::Time::FromInternalValue(3),
-      base::WrapUnique(foo_key->Copy())));
+      "foo.com", base::Time::FromInternalValue(3), foo_key->Copy()));
 
   std::vector<std::unique_ptr<net::DefaultChannelIDStore::ChannelID>>
       channel_ids;
   // Replace the store effectively destroying the current one and forcing it
   // to write its data to disk. Then we can see if after loading it again it
   // is still there.
   store_ = NULL;
   // Make sure we wait until the destructor has run.
   base::RunLoop().RunUntilIdle();
   store_ = new QuotaPolicyChannelIDStore(
@@ skipping 34 matching lines @@
 
   // Reload and check if the channel ID has been removed.
   Load(&channel_ids);
   ASSERT_EQ(0U, channel_ids.size());
 }
 
 // Test if data is stored as expected in the QuotaPolicy database.
 TEST_F(QuotaPolicyChannelIDStoreTest, TestPolicy) {
   store_->AddChannelID(net::DefaultChannelIDStore::ChannelID(
       "google.com", base::Time::FromInternalValue(1),
-      base::WrapUnique(crypto::ECPrivateKey::Create())));
+      crypto::ECPrivateKey::Create()));
   store_->AddChannelID(net::DefaultChannelIDStore::ChannelID(
       "nonpersistent.com", base::Time::FromInternalValue(3),
-      base::WrapUnique(crypto::ECPrivateKey::Create())));
+      crypto::ECPrivateKey::Create()));
 
   std::vector<std::unique_ptr<net::DefaultChannelIDStore::ChannelID>>
       channel_ids;
   // Replace the store effectively destroying the current one and forcing it
   // to write its data to disk. Then we can see if after loading it again it
   // is still there.
   store_ = NULL;
   // Make sure we wait until the destructor has run.
   base::RunLoop().RunUntilIdle();
   // Specify storage policy that makes "nonpersistent.com" session only.
   scoped_refptr<content::MockSpecialStoragePolicy> storage_policy =
       new content::MockSpecialStoragePolicy();
   storage_policy->AddSessionOnly(
       net::cookie_util::CookieOriginToURL("nonpersistent.com", true));
   // Reload store, it should still have both channel IDs.
   store_ = new QuotaPolicyChannelIDStore(
       temp_dir_.path().Append(kTestChannelIDFilename),
       base::ThreadTaskRunnerHandle::Get(),
       storage_policy);
   Load(&channel_ids);
   ASSERT_EQ(2U, channel_ids.size());
 
   // Add another two channel IDs before closing the store. Because additions are
   // delayed and committed to disk in batches, these will not be committed until
   // the store is destroyed, which is after the policy is applied. The pending
   // operation pruning logic should prevent the "nonpersistent.com" ID from
   // being committed to disk.
   store_->AddChannelID(net::DefaultChannelIDStore::ChannelID(
       "nonpersistent.com", base::Time::FromInternalValue(5),
-      base::WrapUnique(crypto::ECPrivateKey::Create())));
+      crypto::ECPrivateKey::Create()));
   store_->AddChannelID(net::DefaultChannelIDStore::ChannelID(
       "persistent.com", base::Time::FromInternalValue(7),
-      base::WrapUnique(crypto::ECPrivateKey::Create())));
+      crypto::ECPrivateKey::Create()));
 
   // Now close the store, and the nonpersistent.com channel IDs should be
   // deleted according to policy.
   store_ = NULL;
   // Make sure we wait until the destructor has run.
   base::RunLoop().RunUntilIdle();
   channel_ids.clear();
   store_ = new QuotaPolicyChannelIDStore(
       temp_dir_.path().Append(kTestChannelIDFilename),
       base::ThreadTaskRunnerHandle::Get(),
       NULL);
 
   // Reload and check that the nonpersistent.com channel IDs have been removed.
   Load(&channel_ids);
   ASSERT_EQ(2U, channel_ids.size());
   for (const auto& id : channel_ids) {
     ASSERT_NE("nonpersistent.com", id->server_identifier());
   }
 }