Moving athena/test to athena/test/base

athena/test/base/sample_activity_factory.cc

Index: athena/test/base/sample_activity_factory.cc
diff --git a/athena/test/sample_activity_factory.cc b/athena/test/base/sample_activity_factory.cc
similarity index 93%
rename from athena/test/sample_activity_factory.cc
rename to athena/test/base/sample_activity_factory.cc
index 87bef8c042a1a64dd15dd9604d6d3e1754ea2f9b..e6caec6f59bc12bd4f5a5b0a060e09cae9420c23 100644
--- a/athena/test/sample_activity_factory.cc
+++ b/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"