Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / components / copresence / handlers / audio / audio_directive_list_unittest.cc

diff --git a/src/components/copresence/handlers/audio/audio_directive_list_unittest.cc b/src/components/copresence/handlers/audio/audio_directive_list_unittest.cc
index 5fda542..d95e3b3 100644 (file)
--- a/src/components/copresence/handlers/audio/audio_directive_list_unittest.cc
+++ b/src/components/copresence/handlers/audio/audio_directive_list_unittest.cc
@@ -7,15 +7,15 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/message_loop/message_loop.h"
-#include "testing/gtest/include/gtest/gtest.h"
+#include "testing/gmock/include/gmock/gmock.h"
+
+using testing::IsNull;
 
 namespace copresence {
 
 class AudioDirectiveListTest : public testing::Test {
  public:
-  AudioDirectiveListTest() : directive_list_(new AudioDirectiveList()) {}
-
-  virtual ~AudioDirectiveListTest() {}
+  AudioDirectiveListTest() : directive_list_(new AudioDirectiveList) {}
 
  protected:
   base::MessageLoop message_loop_;
@@ -25,7 +25,7 @@ class AudioDirectiveListTest : public testing::Test {
 TEST_F(AudioDirectiveListTest, Basic) {
   const base::TimeDelta kTtl = base::TimeDelta::FromSeconds(9999);
 
-  EXPECT_EQ(NULL, directive_list_->GetActiveDirective().get());
+  EXPECT_THAT(directive_list_->GetActiveDirective(), IsNull());
 
   directive_list_->AddDirective("op_id1", kTtl);
   directive_list_->AddDirective("op_id2", kTtl * 3);
@@ -53,7 +53,7 @@ TEST_F(AudioDirectiveListTest, AddDirectiveMultiple) {
   directive_list_->RemoveDirective("op_id2");
   EXPECT_EQ("op_id1", directive_list_->GetActiveDirective()->op_id);
   directive_list_->RemoveDirective("op_id1");
-  EXPECT_EQ(NULL, directive_list_->GetActiveDirective().get());
+  EXPECT_THAT(directive_list_->GetActiveDirective(), IsNull());
 }
 
 TEST_F(AudioDirectiveListTest, RemoveDirectiveMultiple) {
@@ -74,7 +74,7 @@ TEST_F(AudioDirectiveListTest, RemoveDirectiveMultiple) {
   directive_list_->RemoveDirective("op_id2");
   EXPECT_EQ("op_id1", directive_list_->GetActiveDirective()->op_id);
   directive_list_->RemoveDirective("op_id1");
-  EXPECT_EQ(NULL, directive_list_->GetActiveDirective().get());
+  EXPECT_THAT(directive_list_->GetActiveDirective(), IsNull());
 }
 
 }  // namespace copresence