Moving athena/test to athena/test/base

athena/test/base/athena_test_helper.cc

Index: athena/test/base/athena_test_helper.cc
diff --git a/athena/test/athena_test_helper.cc b/athena/test/base/athena_test_helper.cc
similarity index 95%
rename from athena/test/athena_test_helper.cc
rename to athena/test/base/athena_test_helper.cc
index b20490c02b352489670d3722631186de25f40c12..a46559e8813fc0bce82247d4cae80460fa140446 100644
--- a/athena/test/athena_test_helper.cc
+++ b/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"