media config: expand is_encrypted to a struct.

media/base/test_helpers.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/test_helpers.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/pickle.h"
 #include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "media/base/audio_buffer.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/decoder_buffer.h"
+#include "media/base/encryption_scheme.h"
 #include "media/base/media_util.h"
 #include "ui/gfx/geometry/rect.h"
 
 using ::testing::_;
 using ::testing::StrictMock;
 
 namespace media {
 
 // Utility mock for testing methods expecting Closures and PipelineStatusCBs.
 class MockCallback : public base::RefCountedThreadSafe<MockCallback> {
@@ skipping 91 matching lines @@
   ADD_FAILURE() << "Timed out waiting for message loop to quit";
   run_loop_->Quit();
 }
 
 static VideoDecoderConfig GetTestConfig(VideoCodec codec,
                                         gfx::Size coded_size,
                                         bool is_encrypted) {
   gfx::Rect visible_rect(coded_size.width(), coded_size.height());
   gfx::Size natural_size = coded_size;
 
+  EncryptionScheme encryption_scheme(
+      is_encrypted ? EncryptionScheme::CIPHER_MODE_AES_CTR
+                   : EncryptionScheme::CIPHER_MODE_UNENCRYPTED);
+
   return VideoDecoderConfig(codec, VIDEO_CODEC_PROFILE_UNKNOWN,
                             PIXEL_FORMAT_YV12, COLOR_SPACE_UNSPECIFIED,
                             coded_size, visible_rect, natural_size,
-                            EmptyExtraData(), is_encrypted);
+                            EmptyExtraData(), encryption_scheme);

[xhwang, 2016/03/07 18:39:52]

ditto

[dougsteed, 2016/03/07 21:12:40]

Done.

 }
 
 static const gfx::Size kNormalSize(320, 240);
 static const gfx::Size kLargeSize(640, 480);
 
 VideoDecoderConfig TestVideoConfig::Invalid() {
   return GetTestConfig(kUnknownVideoCodec, kNormalSize, false);
 }
 
 VideoDecoderConfig TestVideoConfig::Normal() {
@@ skipping 110 matching lines @@
   int width = 0;
   int height = 0;
   bool success = pickle.ReadString(&header) && pickle.ReadInt(&width) &&
                  pickle.ReadInt(&height);
   return (success && header == kFakeVideoBufferHeader &&
           width == config.coded_size().width() &&
           height == config.coded_size().height());
 }
 
 }  // namespace media