Move app_shell specific impl from athena_lib to athena_shell_lib

athena/content/app_activity_unittest.cc

Index: athena/content/app_activity_unittest.cc
diff --git a/athena/content/app_activity_unittest.cc b/athena/content/app_activity_unittest.cc
index d0544f05f13aa18b8019106c31ba8a50bb88c9a3..fa5c3442a0746a57750e2aab3c83219607c27d9f 100644
--- a/athena/content/app_activity_unittest.cc
+++ b/athena/content/app_activity_unittest.cc
@@ -4,10 +4,10 @@
 
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
-#include "athena/content/app_activity.h"
 #include "athena/content/app_activity_registry.h"
 #include "athena/content/public/app_content_control_delegate.h"
 #include "athena/content/public/app_registry.h"
+#include "athena/content/shell/shell_app_activity.h"
 #include "athena/test/athena_test_base.h"
 #include "ui/aura/window.h"
 #include "ui/views/view.h"
@@ -28,10 +28,10 @@ const char kDummyApp1[] = "aaaaaaa";
 const char kDummyApp2[] = "bbbbbbb";
 
 // A dummy test app activity which works without content / ShellAppWindow.
-class TestAppActivity : public AppActivity {
+class TestAppActivity : public ShellAppActivity {

[Jun Mukai, 2014/08/26 21:28:23]

Instead of depending ShellAppActivity, why not:
- inherit from AppActivity
- override GetWebContents() which returns NULL
?

[oshima, 2014/08/26 21:43:27]

That's better, thanks. Done.

  public:
   explicit TestAppActivity(const std::string& app_id) :
-      AppActivity(NULL),
+      ShellAppActivity(NULL),
       app_id_(app_id),
       view_(new views::View()),
       current_state_(ACTIVITY_VISIBLE) {