Introduces ActivityFactory for SampleActivity.

athena/main/athena_main.cc

Index: athena/main/athena_main.cc
diff --git a/athena/main/athena_main.cc b/athena/main/athena_main.cc
index c2f9742632f203a5f9499c2d8881a477d771eb42..90f0343515e026f1b3fe490ba9ac4055310ba200 100644
--- a/athena/main/athena_main.cc
+++ b/athena/main/athena_main.cc
@@ -21,19 +21,13 @@ class AthenaBrowserMainDelegate : public apps::ShellBrowserMainDelegate {
   // apps::ShellBrowserMainDelegate:
   virtual void Start(content::BrowserContext* context) OVERRIDE {
     athena::StartAthena(
-        apps::ShellDesktopController::instance()->host()->window());
-    athena::ActivityFactory::RegisterActivityFactory(
+        apps::ShellDesktopController::instance()->host()->window(),
         new athena::ContentActivityFactory());
     CreateTestWindows();
     CreateTestPages(context);
   }
 
-  virtual void Shutdown() OVERRIDE {
-    // TODO(mukai):cleanup the start/shutdown processes and the dependency to
-    // ContentActivityFactory.
-    athena::ActivityFactory::Shutdown();
-    athena::ShutdownAthena();
-  }
+  virtual void Shutdown() OVERRIDE { athena::ShutdownAthena(); }
 
   virtual apps::ShellDesktopController* CreateDesktopController() OVERRIDE {
     // TODO(mukai): create Athena's own ShellDesktopController subclass so that