Index: webrtc/modules/audio_processing/transient/file_utils_unittest.cc |
diff --git a/webrtc/modules/audio_processing/transient/file_utils_unittest.cc b/webrtc/modules/audio_processing/transient/file_utils_unittest.cc |
index 2909ac397a5615606d982bc373217fa4ba64bb06..b31bf1cb06a61de363c530c66d79aec98d565057 100644 |
--- a/webrtc/modules/audio_processing/transient/file_utils_unittest.cc |
+++ b/webrtc/modules/audio_processing/transient/file_utils_unittest.cc |
@@ -494,10 +494,10 @@ TEST_F(TransientFileUtilsTest, MAYBE_ExpectedErrorReturnValues) { |
std::unique_ptr<double[]> double_buffer(new double[1]); |
std::unique_ptr<FileWrapper> file(FileWrapper::Create()); |
- EXPECT_EQ(-1, ConvertByteArrayToDouble(NULL, &value)); |
- EXPECT_EQ(-1, ConvertByteArrayToDouble(kPiBytes, NULL)); |
+ EXPECT_EQ(-1, ConvertByteArrayToDouble(nullptr, &value)); |
+ EXPECT_EQ(-1, ConvertByteArrayToDouble(kPiBytes, nullptr)); |
- EXPECT_EQ(-1, ConvertDoubleToByteArray(kPi, NULL)); |
+ EXPECT_EQ(-1, ConvertDoubleToByteArray(kPi, nullptr)); |
// Tests with file not opened. |
EXPECT_EQ(0u, ReadInt16BufferFromFile(file.get(), 1, int16_buffer.get())); |
@@ -512,26 +512,27 @@ TEST_F(TransientFileUtilsTest, MAYBE_ExpectedErrorReturnValues) { |
ASSERT_TRUE(file->is_open()) << "File could not be opened:\n" |
<< kTestFileName.c_str(); |
- EXPECT_EQ(0u, ReadInt16BufferFromFile(NULL, 1, int16_buffer.get())); |
- EXPECT_EQ(0u, ReadInt16BufferFromFile(file.get(), 1, NULL)); |
+ EXPECT_EQ(0u, ReadInt16BufferFromFile(nullptr, 1, int16_buffer.get())); |
+ EXPECT_EQ(0u, ReadInt16BufferFromFile(file.get(), 1, nullptr)); |
EXPECT_EQ(0u, ReadInt16BufferFromFile(file.get(), 0, int16_buffer.get())); |
- EXPECT_EQ(0u, ReadInt16FromFileToDoubleBuffer(NULL, 1, double_buffer.get())); |
- EXPECT_EQ(0u, ReadInt16FromFileToDoubleBuffer(file.get(), 1, NULL)); |
+ EXPECT_EQ(0u, |
+ ReadInt16FromFileToDoubleBuffer(nullptr, 1, double_buffer.get())); |
+ EXPECT_EQ(0u, ReadInt16FromFileToDoubleBuffer(file.get(), 1, nullptr)); |
EXPECT_EQ(0u, ReadInt16FromFileToDoubleBuffer(file.get(), |
0, |
double_buffer.get())); |
- EXPECT_EQ(0u, ReadDoubleBufferFromFile(NULL, 1, double_buffer.get())); |
- EXPECT_EQ(0u, ReadDoubleBufferFromFile(file.get(), 1, NULL)); |
+ EXPECT_EQ(0u, ReadDoubleBufferFromFile(nullptr, 1, double_buffer.get())); |
+ EXPECT_EQ(0u, ReadDoubleBufferFromFile(file.get(), 1, nullptr)); |
EXPECT_EQ(0u, ReadDoubleBufferFromFile(file.get(), 0, double_buffer.get())); |
- EXPECT_EQ(0u, WriteInt16BufferToFile(NULL, 1, int16_buffer.get())); |
- EXPECT_EQ(0u, WriteInt16BufferToFile(file.get(), 1, NULL)); |
+ EXPECT_EQ(0u, WriteInt16BufferToFile(nullptr, 1, int16_buffer.get())); |
+ EXPECT_EQ(0u, WriteInt16BufferToFile(file.get(), 1, nullptr)); |
EXPECT_EQ(0u, WriteInt16BufferToFile(file.get(), 0, int16_buffer.get())); |
- EXPECT_EQ(0u, WriteDoubleBufferToFile(NULL, 1, double_buffer.get())); |
- EXPECT_EQ(0u, WriteDoubleBufferToFile(file.get(), 1, NULL)); |
+ EXPECT_EQ(0u, WriteDoubleBufferToFile(nullptr, 1, double_buffer.get())); |
+ EXPECT_EQ(0u, WriteDoubleBufferToFile(file.get(), 1, nullptr)); |
EXPECT_EQ(0u, WriteDoubleBufferToFile(file.get(), 0, double_buffer.get())); |
} |