Moving athena/test to athena/test/base

BUG=412474
TEST=none

Review URL: https://codereview.chromium.org/617043002

Cr-Commit-Position: refs/heads/master@{#297527}

athena/activity/activity_manager_unittest.cc

@@ -6,7 +6,7 @@
 
 #include "athena/activity/public/activity.h"
 #include "athena/activity/public/activity_factory.h"
-#include "athena/test/athena_test_base.h"
+#include "athena/test/base/athena_test_base.h"
 #include "ui/aura/window.h"
 
 namespace athena {

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',

athena/content/app_activity_unittest.cc

@@ -9,7 +9,7 @@
 #include "athena/content/public/app_registry.h"
 #include "athena/extensions/public/extensions_delegate.h"
 #include "athena/resource_manager/public/resource_manager.h"
-#include "athena/test/athena_test_base.h"
+#include "athena/test/base/athena_test_base.h"
 #include "extensions/common/extension_set.h"
 #include "ui/aura/window.h"
 #include "ui/views/view.h"

athena/env/athena_env_unittest.cc

@@ -4,7 +4,7 @@
 
 #include "athena/env/public/athena_env.h"
 
-#include "athena/test/athena_test_base.h"
+#include "athena/test/base/athena_test_base.h"
 #include "base/bind.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"

athena/home/athena_start_page_view_unittest.cc

@@ -5,7 +5,7 @@
 #include "athena/home/athena_start_page_view.h"
 
 #include "athena/home/home_card_constants.h"
-#include "athena/test/athena_test_base.h"
+#include "athena/test/base/athena_test_base.h"
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"

athena/home/home_card_gesture_manager_unittest.cc

@@ -6,7 +6,7 @@
 
 #include "athena/home/home_card_constants.h"
 #include "athena/home/public/home_card.h"
-#include "athena/test/athena_test_base.h"
+#include "athena/test/base/athena_test_base.h"
 #include "base/time/time.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"

athena/home/home_card_unittest.cc

@@ -7,7 +7,7 @@
 #include "athena/activity/public/activity_factory.h"
 #include "athena/home/home_card_constants.h"
 #include "athena/home/home_card_impl.h"
-#include "athena/test/athena_test_base.h"
+#include "athena/test/base/athena_test_base.h"
 #include "athena/wm/public/window_manager.h"
 #include "ui/aura/window.h"
 #include "ui/events/test/event_generator.h"

athena/input/accelerator_manager_unittest.cc

@@ -5,7 +5,7 @@
 #include "athena/input/public/accelerator_manager.h"
 
 #include "athena/input/public/input_manager.h"
-#include "athena/test/athena_test_base.h"
+#include "athena/test/base/athena_test_base.h"
 #include "ui/events/test/event_generator.h"
 
 namespace athena {

athena/resource_manager/memory_pressure_notifier_unittest.cc

@@ -4,7 +4,7 @@
 
 #include "athena/resource_manager/memory_pressure_notifier.h"
 #include "athena/resource_manager/public/resource_manager_delegate.h"
-#include "athena/test/athena_test_base.h"
+#include "athena/test/base/athena_test_base.h"
 
 namespace athena {
 namespace test {

athena/resource_manager/resource_manager_unittest.cc

@@ -7,8 +7,8 @@
 #include "athena/activity/public/activity_view_model.h"
 #include "athena/resource_manager/memory_pressure_notifier.h"
 #include "athena/resource_manager/public/resource_manager.h"
-#include "athena/test/athena_test_base.h"
-#include "athena/test/sample_activity.h"
+#include "athena/test/base/athena_test_base.h"
+#include "athena/test/base/sample_activity.h"
 #include "athena/wm/public/window_manager.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/gfx/image/image_skia.h"

athena/screen/screen_manager_unittest.cc

@@ -7,7 +7,7 @@
 #include <algorithm>
 #include <string>
 
-#include "athena/test/athena_test_base.h"
+#include "athena/test/base/athena_test_base.h"
 #include "athena/util/container_priorities.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"

athena/test/athena_test_base.cc → athena/test/base/athena_test_base.cc

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "athena/test/athena_test_base.h"
+#include "athena/test/base/athena_test_base.h"
 
 #include "athena/env/public/athena_env.h"
 #include "athena/screen/public/screen_manager.h"
-#include "athena/test/athena_test_helper.h"
+#include "athena/test/base/athena_test_helper.h"
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/test/event_generator_delegate_aura.h"
 #include "ui/aura/window.h"

athena/test/athena_test_base.h → athena/test/base/athena_test_base.h

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATHENA_TEST_ATHENA_TEST_BASE_H_
-#define ATHENA_TEST_ATHENA_TEST_BASE_H_
+#ifndef ATHENA_TEST_BASE_ATHENA_TEST_BASE_H_
+#define ATHENA_TEST_BASE_ATHENA_TEST_BASE_H_
 
-#include "athena/test/athena_test_helper.h"
+#include "athena/test/base/athena_test_helper.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -50,4 +50,4 @@ class AthenaTestBase : public testing::Test {
 }  // namespace test
 }  // namespace athena
 
-#endif  // ATHENA_TEST_ATHENA_TEST_BASE_H_
+#endif  // ATHENA_TEST_BASE_ATHENA_TEST_BASE_H_

athena/test/athena_test_helper.cc → athena/test/base/athena_test_helper.cc

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "athena/test/athena_test_helper.h"
+#include "athena/test/base/athena_test_helper.h"
 
 #include "athena/env/public/athena_env.h"
 #include "athena/extensions/public/extensions_delegate.h"
 #include "athena/main/public/athena_launcher.h"
-#include "athena/test/sample_activity_factory.h"
-#include "athena/test/test_app_model_builder.h"
+#include "athena/test/base/sample_activity_factory.h"
+#include "athena/test/base/test_app_model_builder.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/thread.h"

athena/test/athena_test_helper.h → athena/test/base/athena_test_helper.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATHENA_TEST_ATHENA_TEST_HELPER_H_
-#define ATHENA_TEST_ATHENA_TEST_HELPER_H_
+#ifndef ATHENA_TEST_BASE_ATHENA_TEST_HELPER_H_
+#define ATHENA_TEST_BASE_ATHENA_TEST_HELPER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
@@ -71,4 +71,4 @@ class AthenaTestHelper {
 }  // namespace test
 }  // namespace athena
 
-#endif  // ATHENA_TEST_ATHENA_TEST_HELPER_H_
+#endif  // ATHENA_TEST_BASE_ATHENA_TEST_HELPER_H_

athena/test/sample_activity.cc → athena/test/base/sample_activity.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "athena/test/sample_activity.h"
+#include "athena/test/base/sample_activity.h"
 
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/background.h"

athena/test/sample_activity.h → athena/test/base/sample_activity.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATHENA_TEST_SAMPLE_ACTIVITY_H_
-#define ATHENA_TEST_SAMPLE_ACTIVITY_H_
+#ifndef ATHENA_TEST_BASE_SAMPLE_ACTIVITY_H_
+#define ATHENA_TEST_BASE_SAMPLE_ACTIVITY_H_
 
 #include "athena/activity/public/activity.h"
 #include "athena/activity/public/activity_view_model.h"
@@ -59,4 +59,4 @@ class SampleActivity : public Activity,
 }  // namespace test
 }  // namespace athena
 
-#endif  // ATHENA_TEST_SAMPLE_ACTIVITY_H_
+#endif  // ATHENA_TEST_BASE_SAMPLE_ACTIVITY_H_

athena/test/sample_activity_factory.cc → athena/test/base/sample_activity_factory.cc

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "athena/test/sample_activity_factory.h"
+#include "athena/test/base/sample_activity_factory.h"
 
 #include <string>
 
 #include "athena/activity/public/activity_manager.h"
-#include "athena/test/sample_activity.h"
+#include "athena/test/base/sample_activity.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkColor.h"

athena/test/sample_activity_factory.h → athena/test/base/sample_activity_factory.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATHENA_TEST_SAMPLE_ACTIVITY_FACTORY_H_
-#define ATHENA_TEST_SAMPLE_ACTIVITY_FACTORY_H_
+#ifndef ATHENA_TEST_BASE_SAMPLE_ACTIVITY_FACTORY_H_
+#define ATHENA_TEST_BASE_SAMPLE_ACTIVITY_FACTORY_H_
 
 #include "athena/activity/public/activity_factory.h"
 #include "base/macros.h"
@@ -30,4 +30,4 @@ class SampleActivityFactory : public ActivityFactory {
 }  // namespace test
 }  // namespace athena
 
-#endif  // ATHENA_TEST_SAMPLE_ACTIVITY_FACTORY_H_
+#endif  // ATHENA_TEST_BASE_SAMPLE_ACTIVITY_FACTORY_H_

athena/test/test_app_model_builder.cc → athena/test/base/test_app_model_builder.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "athena/test/test_app_model_builder.h"
+#include "athena/test/base/test_app_model_builder.h"
 
 #include "ui/app_list/app_list_item.h"
 #include "ui/app_list/app_list_model.h"

athena/test/test_app_model_builder.h → athena/test/base/test_app_model_builder.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATHENA_TEST_TEST_APP_MODEL_BUILDER_H_
-#define ATHENA_TEST_TEST_APP_MODEL_BUILDER_H_
+#ifndef ATHENA_TEST_BASE_TEST_APP_MODEL_BUILDER_H_
+#define ATHENA_TEST_BASE_TEST_APP_MODEL_BUILDER_H_
 
 #include "athena/home/public/app_model_builder.h"
 #include "base/macros.h"
@@ -24,4 +24,4 @@ class TestAppModelBuilder : public AppModelBuilder {
 
 }  // namespace athena
 
-#endif  // ATHENA_TEST_TEST_APP_MODEL_BUILDER_H_
+#endif  // ATHENA_TEST_BASE_TEST_APP_MODEL_BUILDER_H_

athena/wm/split_view_controller_unittest.cc

@@ -5,7 +5,7 @@
 #include "athena/wm/split_view_controller.h"
 
 #include "athena/screen/public/screen_manager.h"
-#include "athena/test/athena_test_base.h"
+#include "athena/test/base/athena_test_base.h"
 #include "athena/wm/public/window_list_provider.h"
 #include "athena/wm/test/window_manager_impl_test_api.h"
 #include "base/memory/scoped_vector.h"

athena/wm/window_list_provider_impl_unittest.cc

@@ -6,7 +6,7 @@
 
 #include <algorithm>
 
-#include "athena/test/athena_test_base.h"
+#include "athena/test/base/athena_test_base.h"
 #include "athena/wm/public/window_list_provider_observer.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"

athena/wm/window_manager_unittest.cc

@@ -5,7 +5,7 @@
 #include "athena/wm/public/window_manager.h"
 
 #include "athena/screen/public/screen_manager.h"
-#include "athena/test/athena_test_base.h"
+#include "athena/test/base/athena_test_base.h"
 #include "athena/wm/public/window_list_provider.h"
 #include "athena/wm/split_view_controller.h"
 #include "athena/wm/test/window_manager_impl_test_api.h"