Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / remoting / protocol / pairing_registry_unittest.cc

diff --git a/src/remoting/protocol/pairing_registry_unittest.cc b/src/remoting/protocol/pairing_registry_unittest.cc
index eefea2a..f0aa251 100644 (file)
--- a/src/remoting/protocol/pairing_registry_unittest.cc
+++ b/src/remoting/protocol/pairing_registry_unittest.cc
@@ -62,9 +62,7 @@ namespace protocol {
 
 class PairingRegistryTest : public testing::Test {
  public:
-  virtual void SetUp() OVERRIDE {
-    callback_count_ = 0;
-  }
+  void SetUp() override { callback_count_ = 0; }
 
   void set_pairings(scoped_ptr<base::ListValue> pairings) {
     pairings_ = pairings.Pass();
@@ -91,7 +89,7 @@ class PairingRegistryTest : public testing::Test {
 
 TEST_F(PairingRegistryTest, CreateAndGetPairings) {
   scoped_refptr<PairingRegistry> registry = new SynchronousPairingRegistry(
-      scoped_ptr<PairingRegistry::Delegate>(new MockPairingRegistryDelegate()));
+      make_scoped_ptr(new MockPairingRegistryDelegate()));
   PairingRegistry::Pairing pairing_1 = registry->CreatePairing("my_client");
   PairingRegistry::Pairing pairing_2 = registry->CreatePairing("my_client");
 
@@ -113,7 +111,7 @@ TEST_F(PairingRegistryTest, CreateAndGetPairings) {
 
 TEST_F(PairingRegistryTest, GetAllPairings) {
   scoped_refptr<PairingRegistry> registry = new SynchronousPairingRegistry(
-      scoped_ptr<PairingRegistry::Delegate>(new MockPairingRegistryDelegate()));
+      make_scoped_ptr(new MockPairingRegistryDelegate()));
   PairingRegistry::Pairing pairing_1 = registry->CreatePairing("client1");
   PairingRegistry::Pairing pairing_2 = registry->CreatePairing("client2");
 
@@ -141,7 +139,7 @@ TEST_F(PairingRegistryTest, GetAllPairings) {
 
 TEST_F(PairingRegistryTest, DeletePairing) {
   scoped_refptr<PairingRegistry> registry = new SynchronousPairingRegistry(
-      scoped_ptr<PairingRegistry::Delegate>(new MockPairingRegistryDelegate()));
+      make_scoped_ptr(new MockPairingRegistryDelegate()));
   PairingRegistry::Pairing pairing_1 = registry->CreatePairing("client1");
   PairingRegistry::Pairing pairing_2 = registry->CreatePairing("client2");
 
@@ -166,7 +164,7 @@ TEST_F(PairingRegistryTest, DeletePairing) {
 
 TEST_F(PairingRegistryTest, ClearAllPairings) {
   scoped_refptr<PairingRegistry> registry = new SynchronousPairingRegistry(
-      scoped_ptr<PairingRegistry::Delegate>(new MockPairingRegistryDelegate()));
+      make_scoped_ptr(new MockPairingRegistryDelegate()));
   PairingRegistry::Pairing pairing_1 = registry->CreatePairing("client1");
   PairingRegistry::Pairing pairing_2 = registry->CreatePairing("client2");
 
@@ -217,7 +215,7 @@ TEST_F(PairingRegistryTest, SerializedRequests) {
 
   scoped_refptr<PairingRegistry> registry = new PairingRegistry(
       base::ThreadTaskRunnerHandle::Get(),
-      scoped_ptr<PairingRegistry::Delegate>(new MockPairingRegistryDelegate()));
+      make_scoped_ptr(new MockPairingRegistryDelegate()));
   PairingRegistry::Pairing pairing_1 = registry->CreatePairing("client1");
   PairingRegistry::Pairing pairing_2 = registry->CreatePairing("client2");
   registry->GetPairing(