From 36ce80d5301664b4839ebd2f4570f062cbabf862 Mon Sep 17 00:00:00 2001
From: Chris Craik <ccraik@google.com>
Date: Thu, 12 May 2016 17:50:34 -0700
Subject: [PATCH] Fix Skia filter behavior test

Fixes: 28751534

Change-Id: Ie5e2ee946b21702539fc0cc7358d0f9550e7d095
---
 libs/hwui/tests/unit/SkiaBehaviorTests.cpp | 23 +++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/libs/hwui/tests/unit/SkiaBehaviorTests.cpp b/libs/hwui/tests/unit/SkiaBehaviorTests.cpp
index e7e8af19b274c..cd759cb3d3b6c 100644
--- a/libs/hwui/tests/unit/SkiaBehaviorTests.cpp
+++ b/libs/hwui/tests/unit/SkiaBehaviorTests.cpp
@@ -51,15 +51,20 @@ TEST(SkiaBehavior, genIds) {
 }
 
 TEST(SkiaBehavior, lightingColorFilter_simplify) {
-    SkAutoTUnref<SkColorFilter> filter(SkColorMatrixFilter::CreateLightingFilter(0x11223344, 0));
+    {
+        SkAutoTUnref<SkColorFilter> filter(
+                SkColorMatrixFilter::CreateLightingFilter(0x11223344, 0));
 
-    SkColor observedColor;
-    SkXfermode::Mode observedMode;
-    ASSERT_TRUE(filter->asColorMode(&observedColor, &observedMode));
-    EXPECT_EQ(0xFF223344, observedColor);
-    EXPECT_EQ(SkXfermode::Mode::kModulate_Mode, observedMode);
+        SkColor observedColor;
+        SkXfermode::Mode observedMode;
+        ASSERT_TRUE(filter->asColorMode(&observedColor, &observedMode));
+        EXPECT_EQ(0xFF223344, observedColor);
+        EXPECT_EQ(SkXfermode::Mode::kModulate_Mode, observedMode);
+    }
 
-    SkAutoTUnref<SkColorFilter> failFilter(
-            SkColorMatrixFilter::CreateLightingFilter(0x11223344, 0x1));
-    EXPECT_FALSE(filter->asColorMode(nullptr, nullptr));
+    {
+        SkAutoTUnref<SkColorFilter> failFilter(
+                SkColorMatrixFilter::CreateLightingFilter(0x11223344, 0x1));
+        EXPECT_FALSE(failFilter->asColorMode(nullptr, nullptr));
+    }
 }