Convert //google_apis from scoped_ptr to std::unique_ptr

google_apis/gcm/engine/heartbeat_manager_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 "google_apis/gcm/engine/heartbeat_manager.h"
 
+#include <memory>
+
 #include "base/bind.h"
 #include "base/bind_helpers.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "google_apis/gcm/protocol/mcs.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gcm {
 
 namespace {
@@ skipping 34 matching lines @@
   int reconnects_triggered() const { return reconnects_triggered_; }
 
   // Starts the heartbeat manager.
   void StartManager();
 
  private:
   // Helper functions for verifying heartbeat manager effects.
   void SendHeartbeatClosure();
   void TriggerReconnectClosure(ConnectionFactory::ConnectionResetReason reason);
 
-  scoped_ptr<TestHeartbeatManager> manager_;
+  std::unique_ptr<TestHeartbeatManager> manager_;
 
   int heartbeats_sent_;
   int reconnects_triggered_;
 
   scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
   base::ThreadTaskRunnerHandle task_runner_handle_;
 };
 
 HeartbeatManagerTest::HeartbeatManagerTest()
     : manager_(new TestHeartbeatManager()),
@@ skipping 100 matching lines @@
 
   EXPECT_LE(manager()->GetNextHeartbeatTime() - base::TimeTicks::Now(),
             base::TimeDelta::FromMilliseconds(kIntervalMs));
   EXPECT_NE(heartbeat, manager()->GetNextHeartbeatTime());
 }
 
 // Updating the timer used for heartbeats before starting should not start the
 // timer.
 TEST_F(HeartbeatManagerTest, UpdateTimerBeforeStart) {
   manager()->UpdateHeartbeatTimer(
-      make_scoped_ptr(new base::Timer(true, false)));
+      base::WrapUnique(new base::Timer(true, false)));
   EXPECT_TRUE(manager()->GetNextHeartbeatTime().is_null());
 }
 
 // Updating the timer used for heartbeats after starting should restart the
 // timer but not increase the heartbeat time by more than a millisecond.
 TEST_F(HeartbeatManagerTest, UpdateTimerAfterStart) {
   StartManager();
   base::TimeTicks heartbeat = manager()->GetNextHeartbeatTime();
 
   manager()->UpdateHeartbeatTimer(
-      make_scoped_ptr(new base::Timer(true, false)));
+      base::WrapUnique(new base::Timer(true, false)));
   EXPECT_LT(manager()->GetNextHeartbeatTime() - heartbeat,
             base::TimeDelta::FromMilliseconds(5));
 }
 
 // Stopping the manager should reset the heartbeat timer.
 TEST_F(HeartbeatManagerTest, Stop) {
   StartManager();
   EXPECT_GT(manager()->GetNextHeartbeatTime(), base::TimeTicks::Now());
 
   manager()->Stop();
@@ skipping 99 matching lines @@
   heartbeat = manager()->GetNextHeartbeatTime();
   EXPECT_GT(heartbeat - base::TimeTicks::Now(),
             base::TimeDelta::FromMilliseconds(kDefaultAckIntervalMs));
   EXPECT_LE(heartbeat - base::TimeTicks::Now(),
             base::TimeDelta::FromMilliseconds(kCustomIntervalMs));
 }
 
 }  // namespace
 
 }  // namespace gcm