Moving athena/test to athena/test/base

athena/test/base/sample_activity_factory.cc

 // 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.
 
-#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"
 #include "url/gurl.h"
 
 namespace athena {
 namespace test {
 
 namespace {
 const SkColor kDefaultColor = SK_ColorRED;
@@ skipping 22 matching lines @@
     views::WebView* web_view) {
   DCHECK(!web_view);
   Activity* activity = new SampleActivity(
       kDefaultAppColor, kDefaultAppContentColor, base::UTF8ToUTF16("App"));
   ActivityManager::Get()->AddActivity(activity);
   return activity;
 }
 
 }  // namespace test
 }  // namespace athena