diff --git a/webrtc/media/base/videoframe_unittest.h b/webrtc/media/base/videoframe_unittest.h
index 06afd0eb4c..f19d0325d6 100644
--- a/webrtc/media/base/videoframe_unittest.h
+++ b/webrtc/media/base/videoframe_unittest.h
@@ -1216,10 +1216,7 @@ class VideoFrameTest : public testing::Test {
       EXPECT_FALSE(expected_result);  // NULL is okay if failure was expected.
       return;
     }
-    // TODO(pbos): Remove kPad once http://llvm.org/PR28348 is fixed and the fix
-    // is rolled in.
-    volatile const int kPad = 4095;
-    data_ptr += kPadToHeapSized + (-(static_cast<int>(data_size)) & kPad);
+    data_ptr += kPadToHeapSized + (-(static_cast<int>(data_size)) & 4095);
     memcpy(data_ptr, sample, std::min(data_size, sample_size));
     for (int i = 0; i < repeat_; ++i) {
       EXPECT_EQ(expected_result, frame.Validate(fourcc, kWidth, kHeight,