[Athena: Cleanup] consolidate ChromeAppActivity and ShellAppActivity

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_registry.h"
 #include "athena/extensions/public/extensions_delegate.h"
@@ skipping 51 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 views::WebView* GetWebView() 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 views::Widget* CreateWidget() OVERRIDE { return NULL; }
   virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE {
     return gfx::ImageSkia();
   }
@@ skipping 337 matching lines @@
   // However - the restart in this test framework does not really restart and
   // all objects should be still there..
   EXPECT_EQ(1, AppRegistry::Get()->NumberOfApplications());
   EXPECT_TRUE(app_activity_registry->unloaded_activity_proxy());
   Activity::Delete(app_activity_registry->unloaded_activity_proxy());
   EXPECT_EQ(0, AppRegistry::Get()->NumberOfApplications());
 }
 
 }  // namespace test
 }  // namespace athena