Moving athena/test to athena/test/base

athena/test/sample_activity.h

Index: athena/test/sample_activity.h
diff --git a/athena/test/sample_activity.h b/athena/test/sample_activity.h
deleted file mode 100644
index 6bde1465943ea97507d681803ced53d7c5c77e29..0000000000000000000000000000000000000000
--- a/athena/test/sample_activity.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// 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.
-
-#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"
-
-namespace gfx {
-class ImageSkia;
-}
-
-namespace athena {
-namespace test {
-
-class SampleActivity : public Activity,
-                       public ActivityViewModel {
- public:
-  SampleActivity(SkColor color,
-                 SkColor contents_color,
-                 const base::string16& title);
-  virtual ~SampleActivity();
-
-  // athena::Activity:
-  virtual athena::ActivityViewModel* GetActivityViewModel() OVERRIDE;
-  virtual void SetCurrentState(Activity::ActivityState state) OVERRIDE;
-  virtual ActivityState GetCurrentState() OVERRIDE;
-  virtual bool IsVisible() OVERRIDE;
-  virtual ActivityMediaState GetMediaState() OVERRIDE;
-  virtual aura::Window* GetWindow() OVERRIDE;
-  virtual content::WebContents* GetWebContents() OVERRIDE;
-
-  // athena::ActivityViewModel:
-  virtual void Init() OVERRIDE;
-  virtual SkColor GetRepresentativeColor() const OVERRIDE;
-  virtual base::string16 GetTitle() const OVERRIDE;
-  virtual gfx::ImageSkia GetIcon() const OVERRIDE;
-  virtual bool UsesFrame() const OVERRIDE;
-  virtual views::View* GetContentsView() OVERRIDE;
-  virtual views::Widget* CreateWidget() OVERRIDE;
-  virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE;
-  virtual void PrepareContentsForOverview() OVERRIDE;
-  virtual void ResetContentsView() OVERRIDE;
-
- private:
-  SkColor color_;
-  SkColor contents_color_;
-  base::string16 title_;
-  views::View* contents_view_;
-
-  // The current state for this activity.
-  ActivityState current_state_;
-
-  DISALLOW_COPY_AND_ASSIGN(SampleActivity);
-};
-
-}  // namespace test
-}  // namespace athena
-
-#endif  // ATHENA_TEST_SAMPLE_ACTIVITY_H_