Get FileSelect dialog work on athena

athena/activity/activity_manager_unittest.cc

Index: athena/activity/activity_manager_unittest.cc
diff --git a/athena/activity/activity_manager_unittest.cc b/athena/activity/activity_manager_unittest.cc
index f24d1b5fb1d471bd2638910847d2ddeac614f61c..6592ee8b3f9bc90a1f4acfd26c9fa2d290e6fdf5 100644
--- a/athena/activity/activity_manager_unittest.cc
+++ b/athena/activity/activity_manager_unittest.cc
@@ -16,8 +16,10 @@ typedef test::AthenaTestBase ActivityManagerTest;
 TEST_F(ActivityManagerTest, Basic) {
   ActivityManagerImpl* activity_manager =
       static_cast<ActivityManagerImpl*>(ActivityManager::Get());
-  Activity* activity1 = athena::ActivityFactory::Get()->CreateWebActivity(
-      NULL, base::string16(), GURL());
+  ActivityFactory* factory = ActivityFactory::Get();
+
+  Activity* activity1 =
+      factory->CreateWebActivity(NULL, base::string16(), GURL());
   EXPECT_EQ(1, activity_manager->num_activities());
 
   // Activity is not visible when created.
@@ -25,8 +27,8 @@ TEST_F(ActivityManagerTest, Basic) {
   Activity::Show(activity1);
   EXPECT_TRUE(activity1->GetWindow()->TargetVisibility());
 
-  Activity* activity2 = athena::ActivityFactory::Get()->CreateWebActivity(
-      NULL, base::string16(), GURL());
+  Activity* activity2 =
+      factory->CreateWebActivity(NULL, base::string16(), GURL());
   EXPECT_EQ(2, activity_manager->num_activities());
 
   Activity::Delete(activity1);
@@ -37,4 +39,22 @@ TEST_F(ActivityManagerTest, Basic) {
   EXPECT_EQ(0, activity_manager->num_activities());
 }
 
+TEST_F(ActivityManagerTest, GetActivityForWindow) {
+  ActivityManager* manager = ActivityManager::Get();
+  ActivityFactory* factory = ActivityFactory::Get();
+
+  Activity* activity1 =
+      factory->CreateWebActivity(NULL, base::string16(), GURL());
+  Activity* activity2 =
+      factory->CreateWebActivity(NULL, base::string16(), GURL());
+
+  EXPECT_EQ(activity1, manager->GetActivityForWindow(activity1->GetWindow()));
+  EXPECT_EQ(activity2, manager->GetActivityForWindow(activity2->GetWindow()));
+
+  EXPECT_EQ(NULL, manager->GetActivityForWindow(NULL));
+
+  scoped_ptr<aura::Window> window = CreateTestWindow(NULL, gfx::Rect());
+  EXPECT_EQ(NULL, manager->GetActivityForWindow(window.get()));
+}
+
 }  // namespace athena