Move app_shell specific impl from athena_lib to athena_shell_lib

athena/content/app_activity_unittest.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/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"
 #include "ui/views/widget/widget.h"
 
 
 namespace content {
 class BrowserContext;
 }
 
 namespace athena {
 namespace test {
 
 namespace {
 
 // An identifier for the running apps.
 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) {
     app_activity_registry_ =
         AppRegistry::Get()->GetAppActivityRegistry(app_id, NULL);
     app_activity_registry_->RegisterAppActivity(this);
   }
   virtual ~TestAppActivity() {
     app_activity_registry_->UnregisterAppActivity(this);
   }
@@ skipping 357 matching lines @@
   activity_proxy->SetCurrentState(Activity::ACTIVITY_VISIBLE);
   EXPECT_EQ(1, test_app_content_control_delegate()->restart_called());
 
   // However - the restart in this test framework does not really restart and
   // all objects should be gone now.
   EXPECT_EQ(0, AppRegistry::Get()->NumberOfApplications());
 }
 
 }  // namespace test
 }  // namespace athena