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

net/ssl/channel_id_service_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 "net/ssl/channel_id_service.h"
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"

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

No longer used, I think.

 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "crypto/ec_private_key.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "net/cert/asn1_util.h"
 #include "net/cert/x509_certificate.h"
@@ skipping 68 matching lines @@
   // CallGetChannelIDCallbackWithResult.
   return ERR_IO_PENDING;
 }
 
 void MockChannelIDStoreWithAsyncGet::CallGetChannelIDCallbackWithResult(
     int err,
     crypto::ECPrivateKey* key) {
   if (err == OK)
     channel_id_count_ = 1;
   base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE,
-      base::Bind(callback_, err, server_identifier_,
-                 base::Passed(base::WrapUnique(key ? key->Copy() : nullptr))));
+      FROM_HERE, base::Bind(callback_, err, server_identifier_,
+                            base::Passed(key ? key->Copy() : nullptr)));
 }
 
 class ChannelIDServiceTest : public testing::Test {
  public:
   ChannelIDServiceTest()
       : service_(new ChannelIDService(new DefaultChannelIDStore(NULL),
                                       base::ThreadTaskRunnerHandle::Get())) {}
 
  protected:
   std::unique_ptr<ChannelIDService> service_;
@@ skipping 507 matching lines @@
   EXPECT_EQ(1u, service_->inflight_joins());
   EXPECT_TRUE(key1);
   EXPECT_TRUE(KeysEqual(key1.get(), key2.get()));
   EXPECT_FALSE(request1.is_active());
   EXPECT_FALSE(request2.is_active());
 }
 
 }  // namespace
 
 }  // namespace net