commit | 036b111df5e0f73236a6abe8d59aae0ea28d217d | [log] [tgz] |
---|---|---|
author | Haibo Huang <hhb@google.com> | Mon May 20 16:47:36 2019 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon May 20 16:47:36 2019 +0000 |
tree | 944c2bb54cf8198d495db3c1a0fb3c83f87539b7 | |
parent | fc2c72654742c680588ea0c134d955a3e219190f [diff] | |
parent | fd43b5f0cd059606d9261bcd7cedc2d5dda44771 [diff] |
Merge "Using ::testing::DoAll"
diff --git a/services/surfaceflinger/tests/fakehwc/SFFakeHwc_test.cpp b/services/surfaceflinger/tests/fakehwc/SFFakeHwc_test.cpp index 9b31985..28cac2e 100644 --- a/services/surfaceflinger/tests/fakehwc/SFFakeHwc_test.cpp +++ b/services/surfaceflinger/tests/fakehwc/SFFakeHwc_test.cpp
@@ -54,10 +54,11 @@ namespace { // Mock test helpers +using ::testing::_; +using ::testing::DoAll; using ::testing::Invoke; using ::testing::Return; using ::testing::SetArgPointee; -using ::testing::_; using Transaction = SurfaceComposerClient::Transaction;