athena: Use ActivityList where appropriate, and fix AppActivity tests.

athena/content/app_activity.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/content/app_activity.h"
 
 #include "athena/activity/public/activity_manager.h"
 #include "athena/activity/public/activity_view.h"
 #include "athena/content/app_activity_registry.h"
 #include "athena/content/content_proxy.h"
@@ skipping 60 matching lines @@
       // This will cause the application to shut down, close its windows and
       // delete this object. Instead a |AppActivityProxy| will be created as
       // place holder.
       if (app_activity_registry_)
         app_activity_registry_->Unload();
       break;
   }
 }
 
 Activity::ActivityState AppActivity::GetCurrentState() {
-  DCHECK(web_view_ || ACTIVITY_UNLOADED == current_state_);
+  DCHECK(GetContentsView() || ACTIVITY_UNLOADED == current_state_);
   return current_state_;
 }
 
 bool AppActivity::IsVisible() {
   return web_view_ &&
          web_view_->visible() &&
          current_state_ != ACTIVITY_UNLOADED;
 }
 
 Activity::ActivityMediaState AppActivity::GetMediaState() {
   return current_state_ == ACTIVITY_UNLOADED ?
       Activity::ACTIVITY_MEDIA_STATE_NONE :
       GetActivityMediaState(GetWebContents());
 }
 
 aura::Window* AppActivity::GetWindow() {
-  return web_view_ && web_view_->GetWidget()
-             ? web_view_->GetWidget()->GetNativeWindow()
-             : nullptr;
+  views::View* view = GetContentsView();
+  return (view && view->GetWidget()) ? view->GetWidget()->GetNativeWindow()
+                                     : nullptr;
 }
 
 content::WebContents* AppActivity::GetWebContents() {
   return !web_view_ ? nullptr : web_view_->GetWebContents();
 }
 
 void AppActivity::Init() {
   // Before we remove the proxy, we have to register the activity and
   // initialize its to move it to the proper activity list location.
   RegisterActivity();
@@ skipping 43 matching lines @@
     SetCurrentState(ACTIVITY_INVISIBLE);
   }
 }
 
 SkColor AppActivity::GetRepresentativeColor() const {
   // TODO(sad): Compute the color from the favicon.
   return SK_ColorGRAY;
 }
 
 base::string16 AppActivity::GetTitle() const {
-  return web_view_->GetWebContents()->GetTitle();
+  return web_view_ ? web_view_->GetWebContents()->GetTitle() : base::string16();
 }
 
 gfx::ImageSkia AppActivity::GetIcon() const {
   return gfx::ImageSkia();
 }
 
 void AppActivity::SetActivityView(ActivityView* view) {
   DCHECK(!activity_view_);
   activity_view_ = view;
 }
@@ skipping 51 matching lines @@
 void AppActivity::DidUpdateFaviconURL(
     const std::vector<content::FaviconURL>& candidates) {
   if (activity_view_)
     activity_view_->UpdateIcon();
 }
 
 // Register an |activity| with an application.
 // Note: This should only get called once for an |app_window| of the
 // |activity|.
 void AppActivity::RegisterActivity() {
-  content::WebContents* web_contents = web_view_->GetWebContents();
+  content::WebContents* web_contents = web_view_ ? web_view_->GetWebContents()
+                                                 : nullptr;
   AppRegistry* app_registry = AppRegistry::Get();
   // Get the application's registry.
   app_activity_registry_ = app_registry->GetAppActivityRegistry(
-      app_id_, web_contents->GetBrowserContext());
+      app_id_, web_contents ? web_contents->GetBrowserContext() : nullptr);
   DCHECK(app_activity_registry_);
   // Register the activity.
   app_activity_registry_->RegisterAppActivity(this);
 }
 
 void AppActivity::HideContentProxy() {
   content_proxy_.reset();
 }
 
 void AppActivity::ShowContentProxy() {
   if (!content_proxy_.get() && web_view_)
     content_proxy_.reset(new ContentProxy(web_view_));
 }
 
 }  // namespace athena