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/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 {
  public:
   explicit TestAppActivity(const std::string& app_id) :
-      AppActivity(NULL),
+      AppActivity(),
       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 15 matching lines @@
   virtual bool IsVisible() OVERRIDE {
     return true;
   }
   virtual ActivityMediaState GetMediaState() OVERRIDE {
     return Activity::ACTIVITY_MEDIA_STATE_NONE;
   }
   virtual aura::Window* GetWindow() OVERRIDE {
     return view_->GetWidget()->GetNativeWindow();
   }
 
+  // AppActivity:
+  virtual content::WebContents* GetWebContents() OVERRIDE {
+    return NULL;
+  }
+
   // ActivityViewModel:
   virtual void Init() OVERRIDE {}
   virtual SkColor GetRepresentativeColor() const OVERRIDE { return 0; }
   virtual base::string16 GetTitle() const OVERRIDE { return title_; }
   virtual bool UsesFrame() const OVERRIDE { return true; }
   virtual views::View* GetContentsView() OVERRIDE { return view_; }
   virtual void CreateOverviewModeImage() OVERRIDE {}
 
  private:
   // If known the registry which holds all activities for the associated app.
@@ skipping 322 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