Consolidate AppControllDelegate to ExtensionsDelegate

athena/test/sample_activity_factory.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/test/sample_activity_factory.h"
 
 #include <string>
 
 #include "athena/test/sample_activity.h"
 #include "base/logging.h"
@@ skipping 17 matching lines @@
 SampleActivityFactory::~SampleActivityFactory() {}
 
 Activity* SampleActivityFactory::CreateWebActivity(
     content::BrowserContext* browser_context,
     const GURL& url) {
   return new SampleActivity(
       kDefaultColor, kDefaultContentColor, base::UTF8ToUTF16(url.spec()));
 }
 
 Activity* SampleActivityFactory::CreateAppActivity(
-    extensions::ShellAppWindow* app_window) {
+    extensions::ShellAppWindow* app_window,
+    const std::string& app_id) {
   // SampleActivityFactory can't own the |app_window|, so it must be NULL.
   DCHECK(app_window == NULL);
   return new SampleActivity(
       kDefaultAppColor, kDefaultAppContentColor, base::UTF8ToUTF16("App"));
 }
 
 Activity* SampleActivityFactory::CreateAppActivity(
     apps::AppWindow* app_window) {
   return new SampleActivity(
       kDefaultAppColor, kDefaultAppContentColor, base::UTF8ToUTF16("App"));
 }
 
 }  // namespace test
 }  // namespace athena