commit d34a80a63b47dd6c046afb2be47fa55e6ca7a284
author Fan Xu <fanxu@google.com> Tue Dec 04 11:32:39 2018 -0800
committer Fan Xu <fanxu@google.com> Wed Dec 12 14:59:56 2018 -0800
tree 95b09b6fcb64b9a56ed1679d95487d9145b31a9f
parent cfbe07453ebd7cde74a7ed75568ee2c81d726049

Move BufferHubDefs namespace to ui/BufferHubDefs.h

And move libbufferhubservice off libbufferhub_headers and libpdx_headers
dependency.

Test: build passed, including all the tests under libui and
libbufferhubservice
Bug: 118893702

Change-Id: I8163a7524c6078f9fbb264cf5253d8cbe05dd1c4

services/bufferhub/tests/BufferNode_test.cpp

diff --git a/services/bufferhub/tests/BufferNode_test.cpp b/services/bufferhub/tests/BufferNode_test.cpp
index 3358c87..8555eb7 100644
--- a/services/bufferhub/tests/BufferNode_test.cpp
+++ b/services/bufferhub/tests/BufferNode_test.cpp
@@ -3,7 +3,7 @@
 #include <bufferhub/BufferNode.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-#include <private/dvr/buffer_hub_defs.h>
+#include <ui/BufferHubDefs.h>
 #include <ui/GraphicBufferMapper.h>
 
 namespace android {
@@ -22,7 +22,6 @@
 const uint32_t kFormat = 1;
 const uint64_t kUsage = 0;
 const size_t kUserMetadataSize = 0;
-const size_t kMaxClientsCount = dvr::BufferHubDefs::kMaxNumberOfClients;
 
 class BufferNodeTest : public ::testing::Test {
 protected:
@@ -73,7 +72,7 @@
     uint64_t current_mask = 0ULL;
     uint64_t expected_mask = 0ULL;
 
-    for (int i = 0; i < kMaxClientsCount; ++i) {
+    for (int i = 0; i < BufferHubDefs::kMaxNumberOfClients; ++i) {
         new_client_state_mask = buffer_node->AddNewActiveClientsBitToMask();
         EXPECT_NE(new_client_state_mask, 0);
         EXPECT_FALSE(new_client_state_mask & current_mask);