Introduces ActivityFactory for SampleActivity.

athena/test/sample_activity.h

Index: athena/test/sample_activity.h
diff --git a/athena/main/sample_activity.h b/athena/test/sample_activity.h
similarity index 74%
rename from athena/main/sample_activity.h
rename to athena/test/sample_activity.h
index bbd8b585a6d5aa5154c68defcbc0e8852bc038a2..b95801cfd5c1859ccd0e6f001e31ae070eaea2b5 100644
--- a/athena/main/sample_activity.h
+++ b/athena/test/sample_activity.h
@@ -2,15 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATHENA_MAIN_SAMPLE_ACTIVITY_H_
-#define ATHENA_MAIN_SAMPLE_ACTIVITY_H_
+#ifndef ATHENA_TEST_SAMPLE_ACTIVITY_H_
+#define ATHENA_TEST_SAMPLE_ACTIVITY_H_
 
 #include "athena/activity/public/activity.h"
 #include "athena/activity/public/activity_view_model.h"
 #include "base/memory/scoped_ptr.h"
 
-class SampleActivity : public athena::Activity,
-                       public athena::ActivityViewModel {
+namespace athena {
+namespace test {
+
+class SampleActivity : public Activity,
+                       public ActivityViewModel {
  public:
   SampleActivity(SkColor color, SkColor content, const std::string& title);
   virtual ~SampleActivity();
@@ -32,4 +35,7 @@ class SampleActivity : public athena::Activity,
   DISALLOW_COPY_AND_ASSIGN(SampleActivity);
 };
 
-#endif  // ATHENA_MAIN_SAMPLE_ACTIVITY_H_
+}  // namespace test
+}  // namespace athena
+
+#endif  // ATHENA_TEST_SAMPLE_ACTIVITY_H_