Remove Activity dependency from content_proxy

athena/content/web_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/web_activity.h"
 
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/content/content_proxy.h"
 #include "athena/content/public/dialogs.h"
@@ skipping 617 matching lines @@
   ActivityManager::Get()->UpdateActivity(this);
 }
 
 void WebActivity::HideContentProxy() {
   if (content_proxy_.get())
     content_proxy_.reset(NULL);
 }
 
 void WebActivity::ShowContentProxy() {
   if (!content_proxy_.get() && web_view_)
-    content_proxy_.reset(new ContentProxy(web_view_, this));
+    content_proxy_.reset(new ContentProxy(web_view_));
 }
 
 void WebActivity::ReloadAndObserve() {
   if (web_view_->IsContentEvicted()) {
     DCHECK_EQ(ACTIVITY_UNLOADED, current_state_);
     web_view_->ReloadContent();
   }
   Observe(web_view_->GetWebContents());
 }
 
 }  // namespace athena