Index: remoting/host/host_extension_session_manager_unittest.cc |
diff --git a/remoting/host/host_extension_session_manager_unittest.cc b/remoting/host/host_extension_session_manager_unittest.cc |
index b46263a504a931ba9fcd601932ac2de4e030279d..48f40f8b3d4d1294b98d383cc1c53e3851edb314 100644 |
--- a/remoting/host/host_extension_session_manager_unittest.cc |
+++ b/remoting/host/host_extension_session_manager_unittest.cc |
@@ -3,6 +3,7 @@ |
// found in the LICENSE file. |
#include "base/macros.h" |
+#include "base/memory/ptr_util.h" |
#include "base/strings/string_split.h" |
#include "base/strings/string_util.h" |
#include "remoting/host/client_session_details.h" |
@@ -17,21 +18,22 @@ namespace remoting { |
class HostExtensionSessionManagerTest : public testing::Test { |
public: |
- HostExtensionSessionManagerTest() |
- : extension1_("ext1", "cap1"), |
- extension2_("ext2", std::string()), |
- extension3_("ext3", "cap3") { |
- extensions_.push_back(&extension1_); |
- extensions_.push_back(&extension2_); |
- extensions_.push_back(&extension3_); |
+ HostExtensionSessionManagerTest() { |
+ 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")); |
+ extension1_ = static_cast<FakeExtension*>(extensions_[0].get()); |
+ extension2_ = static_cast<FakeExtension*>(extensions_[1].get()); |
+ extension3_ = static_cast<FakeExtension*>(extensions_[2].get()); |
} |
~HostExtensionSessionManagerTest() override {} |
protected: |
// Fake HostExtensions for testing. |
- FakeExtension extension1_; |
- FakeExtension extension2_; |
- FakeExtension extension3_; |
+ FakeExtension* extension1_; |
+ FakeExtension* extension2_; |
+ FakeExtension* extension3_; |
Sergey Ulanov
2017/01/10 21:24:54
Please remove these 3 fields and update the tests
Avi (use Gerrit)
2017/01/10 23:57:29
Obviated.
|
HostExtensionSessionManager::HostExtensions extensions_; |
// Mocks of interfaces provided by ClientSession. |
@@ -52,9 +54,9 @@ TEST_F(HostExtensionSessionManagerTest, ExtensionMessages_MessageHandled) { |
message.set_type("ext2"); |
extension_manager.OnExtensionMessage(message); |
- EXPECT_FALSE(extension1_.has_handled_message()); |
- EXPECT_TRUE(extension2_.has_handled_message()); |
- EXPECT_FALSE(extension3_.has_handled_message()); |
+ EXPECT_FALSE(extension1_->has_handled_message()); |
+ EXPECT_TRUE(extension2_->has_handled_message()); |
+ EXPECT_FALSE(extension3_->has_handled_message()); |
} |
// Verifies that extension messages not handled by extensions don't result in a |
@@ -69,9 +71,9 @@ TEST_F(HostExtensionSessionManagerTest, ExtensionMessages_MessageNotHandled) { |
message.set_type("ext4"); |
extension_manager.OnExtensionMessage(message); |
- EXPECT_FALSE(extension1_.has_handled_message()); |
- EXPECT_FALSE(extension2_.has_handled_message()); |
- EXPECT_FALSE(extension3_.has_handled_message()); |
+ EXPECT_FALSE(extension1_->has_handled_message()); |
+ EXPECT_FALSE(extension2_->has_handled_message()); |
+ EXPECT_FALSE(extension3_->has_handled_message()); |
} |
// Verifies that the correct set of capabilities are reported to the client, |
@@ -101,9 +103,9 @@ TEST_F(HostExtensionSessionManagerTest, ExtensionCapabilities_AreChecked) { |
message.set_type("ext3"); |
extension_manager.OnExtensionMessage(message); |
- EXPECT_TRUE(extension1_.was_instantiated()); |
- EXPECT_TRUE(extension2_.was_instantiated()); |
- EXPECT_FALSE(extension3_.was_instantiated()); |
+ EXPECT_TRUE(extension1_->was_instantiated()); |
+ EXPECT_TRUE(extension2_->was_instantiated()); |
+ EXPECT_FALSE(extension3_->was_instantiated()); |
} |
} // namespace remoting |