Moving athena/test to athena/test/base

athena/athena.gyp

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 221 matching lines @@
         '../ui/compositor/compositor.gyp:compositor_test_support',
         '../ui/views/views.gyp:views',
         '../ui/wm/wm.gyp:wm',
         '../url/url.gyp:url_lib',
         'athena_content_lib',
         'athena_lib',
         'resources/athena_resources.gyp:athena_resources',
       ],
       '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',
       ],
     },
     {
       'target_name': 'athena_unittests',
       'type': 'executable',
       'dependencies': [
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
         'athena_app_shell_lib',
         'athena_lib',
         'athena_test_support',
         'main/athena_main.gyp:athena_main_lib',
         'resources/athena_resources.gyp:athena_pak',
       ],
       'sources': [
         'activity/activity_manager_unittest.cc',
         'content/app_activity_unittest.cc',
         'env/athena_env_unittest.cc',
         'home/athena_start_page_view_unittest.cc',
         'home/home_card_gesture_manager_unittest.cc',
         'home/home_card_unittest.cc',
         'input/accelerator_manager_unittest.cc',
         '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',
         'wm/window_list_provider_impl_unittest.cc',
         'wm/window_manager_unittest.cc',
       ],
     }
   ],
 }