Introduce system_info as an independent container.

athena/home/home_card_unittest.cc

Index: athena/home/home_card_unittest.cc
diff --git a/athena/home/home_card_unittest.cc b/athena/home/home_card_unittest.cc
index 46ffccd28dca310ef034f62fc334f6e8ea33b632..03e137eeb7932d17546975d22285ba2879637958 100644
--- a/athena/home/home_card_unittest.cc
+++ b/athena/home/home_card_unittest.cc
@@ -225,10 +225,9 @@ TEST_F(HomeCardTest, Gestures) {
   EXPECT_TRUE(WindowManager::Get()->IsOverviewModeActive());
 
   // Swipe down to the bottom state.
-  generator.GestureScrollSequence(gfx::Point(x, 10),
+  generator.GestureScrollSequence(gfx::Point(x, 50),
                                   gfx::Point(x, bottom - 120),
-                                  base::TimeDelta::FromSeconds(1),
-                                  10);
+                                  base::TimeDelta::FromSeconds(1), 10);
   EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());
   EXPECT_TRUE(WindowManager::Get()->IsOverviewModeActive());
 
@@ -240,10 +239,8 @@ TEST_F(HomeCardTest, Gestures) {
   EXPECT_TRUE(WindowManager::Get()->IsOverviewModeActive());
 
   // Swipe down to the minimized state.
-  generator.GestureScrollSequence(gfx::Point(x, 10),
-                                  gfx::Point(x, bottom - 1),
-                                  base::TimeDelta::FromSeconds(1),
-                                  10);
+  generator.GestureScrollSequence(gfx::Point(x, 50), gfx::Point(x, bottom - 1),
+                                  base::TimeDelta::FromSeconds(1), 10);
   EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
   EXPECT_FALSE(WindowManager::Get()->IsOverviewModeActive());
 }