Remove ScopedVector from remoting/.

remoting/host/client_session_unittest.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 "remoting/host/client_session.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 109 matching lines @@
   // Message loop that will process all ClientSession tasks.
   base::MessageLoop message_loop_;
 
   // AutoThreadTaskRunner on which |client_session_| will be run.
   scoped_refptr<AutoThreadTaskRunner> task_runner_;
 
   // Used to run |message_loop_| after each test, until no objects remain that
   // require it.
   base::RunLoop run_loop_;
 
-  // HostExtensions to pass when creating the ClientSession. Caller retains
-  // ownership of the HostExtensions themselves.
-  std::vector<HostExtension*> extensions_;
+  // HostExtensions to pass when creating the ClientSession.
+  std::vector<std::unique_ptr<HostExtension>> extensions_;
 
   // ClientSession instance under test.
   std::unique_ptr<ClientSession> client_session_;
 
   // ClientSession::EventHandler mock for use in tests.
   MockClientSessionEventHandler session_event_handler_;
 
   // Storage for values to be returned by the protocol::Session mock.
   std::unique_ptr<SessionConfig> session_config_;
   const std::string client_jid_;
@@ skipping 233 matching lines @@
     }
   }
 }
 
 // Verifies that clients can have extensions registered, resulting in the
 // correct capabilities being reported, and messages delivered correctly.
 // The extension system is tested more extensively in the
 // HostExtensionSessionManager unit-tests.
 TEST_F(ClientSessionTest, Extensions) {
   // Configure fake extensions for testing.
-  FakeExtension extension1("ext1", "cap1");
-  extensions_.push_back(&extension1);
-  FakeExtension extension2("ext2", "");
-  extensions_.push_back(&extension2);
-  FakeExtension extension3("ext3", "cap3");
-  extensions_.push_back(&extension3);
+  extensions_.push_back(base::MakeUnique<FakeExtension>("ext1", "cap1"));
+  extensions_.push_back(base::MakeUnique<FakeExtension>("ext2", std::string()));
+  extensions_.push_back(base::MakeUnique<FakeExtension>("ext3", "cap3"));
+  FakeExtension* extension1 = static_cast<FakeExtension*>(extensions_[0].get());
+  FakeExtension* extension2 = static_cast<FakeExtension*>(extensions_[1].get());
+  FakeExtension* extension3 = static_cast<FakeExtension*>(extensions_[2].get());
 
   // Verify that the ClientSession reports the correct capabilities.
   EXPECT_CALL(client_stub_, SetCapabilities(EqCapabilities("cap1 cap3")));
 
   CreateClientSession();
   ConnectClientSession();
 
   testing::Mock::VerifyAndClearExpectations(&client_stub_);
 
   // Mimic the client reporting an overlapping set of capabilities.
@@ skipping 11 matching lines @@
   message3.set_data("data");
   client_session_->DeliverClientMessage(message3);
   protocol::ExtensionMessage message4;
   message4.set_type("ext4");
   message4.set_data("data");
   client_session_->DeliverClientMessage(message4);
 
   base::RunLoop().RunUntilIdle();
 
   // ext1 was instantiated and sent a message, and did not wrap anything.
-  EXPECT_TRUE(extension1.was_instantiated());
-  EXPECT_TRUE(extension1.has_handled_message());
+  EXPECT_TRUE(extension1->was_instantiated());
+  EXPECT_TRUE(extension1->has_handled_message());
 
   // ext2 was instantiated but not sent a message, and wrapped video encoder.
-  EXPECT_TRUE(extension2.was_instantiated());
-  EXPECT_FALSE(extension2.has_handled_message());
+  EXPECT_TRUE(extension2->was_instantiated());
+  EXPECT_FALSE(extension2->has_handled_message());
 
   // ext3 was sent a message but not instantiated.
-  EXPECT_FALSE(extension3.was_instantiated());
+  EXPECT_FALSE(extension3->was_instantiated());
 }
 
 }  // namespace remoting