[Athena: Cleanup] consolidate ChromeAppActivity and ShellAppActivity

athena/content/shell/content_activity_factory.cc

Index: athena/content/shell/content_activity_factory.cc
diff --git a/athena/content/shell/content_activity_factory.cc b/athena/content/shell/content_activity_factory.cc
deleted file mode 100644
index 76ee1146bb880aeb3ecf5a205dfe7404be5afa38..0000000000000000000000000000000000000000
--- a/athena/content/shell/content_activity_factory.cc
+++ /dev/null
@@ -1,17 +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.
-
-#include "athena/content/content_activity_factory.h"
-
-#include "athena/content/shell/shell_app_activity.h"
-
-namespace athena {
-
-Activity* ContentActivityFactory::CreateAppActivity(
-    extensions::AppWindow* app_window,
-    views::WebView* web_view) {
-  return new ShellAppActivity(app_window);
-}
-
-}  // namespace athena