Introduces AppActivity and handler of chrome.shell API.

athena/test/sample_activity_factory.cc

Index: athena/test/sample_activity_factory.cc
diff --git a/athena/test/sample_activity_factory.cc b/athena/test/sample_activity_factory.cc
index 218bc21afc1504f6263024a233f8757cebf97a22..cdd059d88e4504403984871336eb62a39c37a5d3 100644
--- a/athena/test/sample_activity_factory.cc
+++ b/athena/test/sample_activity_factory.cc
@@ -7,6 +7,7 @@
 #include <string>
 
 #include "athena/test/sample_activity.h"
+#include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "url/gurl.h"
@@ -34,10 +35,11 @@ Activity* SampleActivityFactory::CreateWebActivity(
 }
 
 Activity* SampleActivityFactory::CreateAppActivity(
-    content::BrowserContext* browser_context,
-    const std::string& app_id) {
+    apps::ShellAppWindow* app_window) {
+  // SampleActivityFactory can't own the |app_window|, so it must be NULL.
+  DCHECK(app_window == NULL);
   return new SampleActivity(
-      kDefaultAppColor, kDefaultAppContentColor, base::UTF8ToUTF16(app_id));
+      kDefaultAppColor, kDefaultAppContentColor, base::UTF8ToUTF16("App"));
 }
 
 }  // namespace test