From 0f6812acd56439235e6e9d24f6f18a701bfdc3c6 Mon Sep 17 00:00:00 2001
From: Botond Ballo <botond@mozilla.com>
Date: Fri, 18 Sep 2015 13:19:05 -0400
Subject: [PATCH] Bug 1014691 - Move TestAsyncPanZoomController.cpp to
 gfx/layers/apz/test/gtest. r=kats,glandium

--HG--
rename : gfx/tests/gtest/TestAsyncPanZoomController.cpp => gfx/layers/apz/test/gtest/TestAsyncPanZoomController.cpp
extra : source : 18f51acd98206483573be0fcf636e6fcc76e89b0
---
 .../gtest/TestAsyncPanZoomController.cpp      |  0
 gfx/layers/apz/test/gtest/moz.build           | 21 +++++++++++++++++++
 gfx/layers/moz.build                          |  3 +++
 gfx/moz.build                                 |  3 ---
 gfx/tests/gtest/moz.build                     |  1 -
 5 files changed, 24 insertions(+), 4 deletions(-)
 rename gfx/{tests => layers/apz/test}/gtest/TestAsyncPanZoomController.cpp (100%)
 create mode 100644 gfx/layers/apz/test/gtest/moz.build

diff --git a/gfx/tests/gtest/TestAsyncPanZoomController.cpp b/gfx/layers/apz/test/gtest/TestAsyncPanZoomController.cpp
similarity index 100%
rename from gfx/tests/gtest/TestAsyncPanZoomController.cpp
rename to gfx/layers/apz/test/gtest/TestAsyncPanZoomController.cpp
diff --git a/gfx/layers/apz/test/gtest/moz.build b/gfx/layers/apz/test/gtest/moz.build
new file mode 100644
index 000000000000..4a1bc8d64f81
--- /dev/null
+++ b/gfx/layers/apz/test/gtest/moz.build
@@ -0,0 +1,21 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+UNIFIED_SOURCES += [
+    'TestAsyncPanZoomController.cpp',
+]
+
+include('/ipc/chromium/chromium-config.mozbuild')
+
+LOCAL_INCLUDES += [
+    '/gfx/2d',
+    '/gfx/layers',
+    '/gfx/tests/gtest'  # for TestLayers.h, which is shared with the gfx gtests
+]
+
+FINAL_LIBRARY = 'xul-gtest'
+
+CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build
index dd58022327c7..5ce9a5863b88 100644
--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@@ -406,6 +406,9 @@ CXXFLAGS += [
     ]
 ]
 
+if CONFIG['ENABLE_TESTS']:
+    DIRS += ['apz/test/gtest']
+
 MOCHITEST_MANIFESTS += ['apz/test/mochitest/mochitest.ini']
 MOCHITEST_CHROME_MANIFESTS += ['apz/test/mochitest/chrome.ini']
 
diff --git a/gfx/moz.build b/gfx/moz.build
index d5e33270335d..2ed70f83a8fb 100644
--- a/gfx/moz.build
+++ b/gfx/moz.build
@@ -4,9 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-with Files('tests/gtest/TestAsyncPanZoomController.cpp'):
-    BUG_COMPONENT = ('Core', 'Panning and Zooming')
-
 if CONFIG['MOZ_TREE_CAIRO']:
     DIRS += ['cairo']
 
diff --git a/gfx/tests/gtest/moz.build b/gfx/tests/gtest/moz.build
index cc1a716d1d1b..cda7439695d6 100644
--- a/gfx/tests/gtest/moz.build
+++ b/gfx/tests/gtest/moz.build
@@ -8,7 +8,6 @@ UNIFIED_SOURCES += [
     'gfxSurfaceRefCountTest.cpp',
     # Disabled on suspicion of causing bug 904227
     #'gfxWordCacheTest.cpp',
-    'TestAsyncPanZoomController.cpp',
     'TestBufferRotation.cpp',
     'TestColorNames.cpp',
     'TestCompositor.cpp',