summaryrefslogtreecommitdiff
path: root/chromium/media/base/android/media_codec_loop_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/media/base/android/media_codec_loop_unittest.cc')
-rw-r--r--chromium/media/base/android/media_codec_loop_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/media/base/android/media_codec_loop_unittest.cc b/chromium/media/base/android/media_codec_loop_unittest.cc
index 5613ea9098b..559cb8c8229 100644
--- a/chromium/media/base/android/media_codec_loop_unittest.cc
+++ b/chromium/media/base/android/media_codec_loop_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -91,7 +91,7 @@ class MediaCodecLoopTest : public testing::Test {
}
void ConstructCodecLoop() {
- int sdk_int = base::android::SDK_VERSION_MARSHMALLOW;
+ int sdk_int = base::android::SDK_VERSION_NOUGAT;
auto codec = std::make_unique<MockMediaCodecBridge>();
// Since we're providing a codec, we do not expect an error.
EXPECT_CALL(*client_, OnCodecLoopError()).Times(0);
@@ -199,7 +199,7 @@ class MediaCodecLoopTest : public testing::Test {
TEST_F(MediaCodecLoopTest, TestConstructionWithNullCodec) {
std::unique_ptr<MediaCodecBridge> codec;
EXPECT_CALL(*client_, OnCodecLoopError()).Times(1);
- const int sdk_int = base::android::SDK_VERSION_MARSHMALLOW;
+ const int sdk_int = base::android::SDK_VERSION_NOUGAT;
codec_loop_ = std::make_unique<MediaCodecLoop>(
sdk_int, client_.get(), std::move(codec),
scoped_refptr<base::SingleThreadTaskRunner>());