Consolidate AppControllDelegate to ExtensionsDelegate

athena/content/public/app_registry.h

Index: athena/content/public/app_registry.h
diff --git a/athena/content/public/app_registry.h b/athena/content/public/app_registry.h
index c296f2e3b780c2f80746355519747b73a4789609..095beba24851775485e849603bd581c49454e3b8 100644
--- a/athena/content/public/app_registry.h
+++ b/athena/content/public/app_registry.h
@@ -19,7 +19,6 @@ class BrowserContext;
 namespace athena {
 
 class AppActivityRegistry;
-class AppContentControlDelegate;
 class AppRegistryImpl;
 
 // This class holds for each application, held by a user, a list of activities.
@@ -37,14 +36,6 @@ class ATHENA_EXPORT AppRegistry {
   // Shuts down the registry (all applications should be shut down by then).
   static void ShutDown();
 
-  // Overrides the used AppContentDelegate. This function will own it
-  // afterwards. A value of NULL is invalid.
-  virtual void SetDelegate(AppContentControlDelegate* delegate) = 0;
-
-  // Retrieves the application content delegate. The ownership remains with this
-  // class.
-  virtual AppContentControlDelegate* GetDelegate() = 0;
-
   // Returns an |AppActivityRegistry| for a given activity |app_id| and
   // |browser_context|.
   virtual AppActivityRegistry* GetAppActivityRegistry(