Moving athena/test to athena/test/base

athena/athena.gyp

Index: athena/athena.gyp
diff --git a/athena/athena.gyp b/athena/athena.gyp
index 93c3dba90af7ec1ab91dcef1b2c39d887e071d73..dbaec6cfda06faab8f740498713b6dcd362ba080 100644
--- a/athena/athena.gyp
+++ b/athena/athena.gyp
@@ -239,17 +239,17 @@
       ],
       'sources': [
         'extensions/test/test_extensions_delegate.cc',
-        'test/athena_test_base.cc',
-        'test/athena_test_base.h',
-        'test/athena_test_helper.cc',
-        'test/athena_test_helper.h',
-        'test/sample_activity.cc',
-        'test/sample_activity.h',
-        'test/sample_activity_factory.cc',
-        'test/sample_activity_factory.h',
-        'test/test_app_model_builder.cc',
-        'test/test_app_model_builder.h',
-        'test/test_resource_manager_delegate.cc',
+        'test/base/athena_test_base.cc',
+        'test/base/athena_test_base.h',
+        'test/base/athena_test_helper.cc',
+        'test/base/athena_test_helper.h',
+        'test/base/sample_activity.cc',
+        'test/base/sample_activity.h',
+        'test/base/sample_activity_factory.cc',
+        'test/base/sample_activity_factory.h',
+        'test/base/test_app_model_builder.cc',
+        'test/base/test_app_model_builder.h',
+        'test/base/test_resource_manager_delegate.cc',
         'wm/test/window_manager_impl_test_api.cc',
         'wm/test/window_manager_impl_test_api.h',
       ],
@@ -277,7 +277,7 @@
         'resource_manager/memory_pressure_notifier_unittest.cc',
         'resource_manager/resource_manager_unittest.cc',
         'screen/screen_manager_unittest.cc',
-        'test/athena_unittests.cc',
+        'test/base/athena_unittests.cc',
         'util/drag_handle_unittest.cc',
         'util/fill_layout_manager_unittest.cc',
         'wm/split_view_controller_unittest.cc',