Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / modules / audio_coding / neteq / audio_vector_unittest.cc

diff --git a/src/third_party/webrtc/modules/audio_coding/neteq/audio_vector_unittest.cc b/src/third_party/webrtc/modules/audio_coding/neteq/audio_vector_unittest.cc
index 50da1fb..0800986 100644 (file)
--- a/src/third_party/webrtc/modules/audio_coding/neteq/audio_vector_unittest.cc
+++ b/src/third_party/webrtc/modules/audio_coding/neteq/audio_vector_unittest.cc
@@ -15,7 +15,7 @@
 
 #include <string>
 
-#include "gtest/gtest.h"
+#include "testing/gtest/include/gtest/gtest.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -65,7 +65,7 @@ TEST_F(AudioVectorTest, PushBackAndCopy) {
   AudioVector vec;
   AudioVector vec_copy;
   vec.PushBack(array_, array_length());
-  vec.CopyFrom(&vec_copy);  // Copy from |vec| to |vec_copy|.
+  vec.CopyTo(&vec_copy);  // Copy from |vec| to |vec_copy|.
   ASSERT_EQ(array_length(), vec.Size());
   ASSERT_EQ(array_length(), vec_copy.Size());
   for (size_t i = 0; i < array_length(); ++i) {
@@ -78,7 +78,7 @@ TEST_F(AudioVectorTest, PushBackAndCopy) {
   EXPECT_TRUE(vec.Empty());
 
   // Now copy the empty vector and verify that the copy becomes empty too.
-  vec.CopyFrom(&vec_copy);
+  vec.CopyTo(&vec_copy);
   EXPECT_TRUE(vec_copy.Empty());
 }
 
@@ -87,7 +87,7 @@ TEST_F(AudioVectorTest, CopyToNull) {
   AudioVector vec;
   AudioVector* vec_copy = NULL;
   vec.PushBack(array_, array_length());
-  vec.CopyFrom(vec_copy);
+  vec.CopyTo(vec_copy);
 }
 
 // Test the PushBack method with another AudioVector as input argument.