Consolidate AppControllDelegate to ExtensionsDelegate

athena/test/sample_activity_factory.h

Index: athena/test/sample_activity_factory.h
diff --git a/athena/test/sample_activity_factory.h b/athena/test/sample_activity_factory.h
index 46d4b94a16954d30a9b00e067ad8a73508bcdc84..5dd9e1ad552bc2b21daa7d089e43ea14ce990955 100644
--- a/athena/test/sample_activity_factory.h
+++ b/athena/test/sample_activity_factory.h
@@ -19,10 +19,9 @@ class SampleActivityFactory : public ActivityFactory {
   // Overridden from ActivityFactory:
   virtual Activity* CreateWebActivity(content::BrowserContext* browser_context,
                                       const GURL& url) OVERRIDE;
-  virtual Activity* CreateAppActivity(
-      extensions::ShellAppWindow* app_window) OVERRIDE;
-  virtual Activity* CreateAppActivity(
-      apps::AppWindow* app_window) OVERRIDE;
+  virtual Activity* CreateAppActivity(extensions::ShellAppWindow* app_window,
+                                      const std::string& app_id) OVERRIDE;
+  virtual Activity* CreateAppActivity(apps::AppWindow* app_window) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SampleActivityFactory);