From e3e086e3f89bbd82d4c92ab78256477af5f712aa Mon Sep 17 00:00:00 2001
From: Haibo Huang <hhb@google.com>
Date: Fri, 17 May 2019 16:11:33 -0700
Subject: [PATCH] Using ::testing::DoAll

Without this statement, compilation failed with new googletest.

Test: build
Bug: 129498355
Change-Id: I9eb7b7a2634f20ef80a23b75c06fc84a2fa52dc3
(cherry picked from commit 9055e93a705864ce00df191a8499686b2bffb613)
---
 libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp        | 1 +
 libwvdrmengine/cdm/core/test/license_unittest.cpp            | 1 +
 libwvdrmengine/cdm/core/test/usage_table_header_unittest.cpp | 1 +
 3 files changed, 3 insertions(+)

diff --git a/libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp b/libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp
index 11290133..23efa9e6 100644
--- a/libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp
+++ b/libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp
@@ -19,6 +19,7 @@
 #include "wv_cdm_constants.h"
 
 using ::testing::_;
+using ::testing::DoAll;
 using ::testing::Eq;
 using ::testing::Invoke;
 using ::testing::NiceMock;
diff --git a/libwvdrmengine/cdm/core/test/license_unittest.cpp b/libwvdrmengine/cdm/core/test/license_unittest.cpp
index d730eb20..ea387fb1 100644
--- a/libwvdrmengine/cdm/core/test/license_unittest.cpp
+++ b/libwvdrmengine/cdm/core/test/license_unittest.cpp
@@ -186,6 +186,7 @@ using video_widevine::WidevinePsshData_EntitledKey;
 
 // gmock methods
 using ::testing::_;
+using ::testing::DoAll;
 using ::testing::Eq;
 using ::testing::NotNull;
 using ::testing::PrintToStringParamName;
diff --git a/libwvdrmengine/cdm/core/test/usage_table_header_unittest.cpp b/libwvdrmengine/cdm/core/test/usage_table_header_unittest.cpp
index 42a258df..c8da9ac6 100644
--- a/libwvdrmengine/cdm/core/test/usage_table_header_unittest.cpp
+++ b/libwvdrmengine/cdm/core/test/usage_table_header_unittest.cpp
@@ -290,6 +290,7 @@ class MockUsageTableHeader : public UsageTableHeader {
 using ::testing::_;
 using ::testing::AllOf;
 using ::testing::AtMost;
+using ::testing::DoAll;
 using ::testing::ElementsAreArray;
 using ::testing::Ge;
 using ::testing::Invoke;