Introduce system_info as an independent container.

athena/home/home_card_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "athena/home/public/home_card.h"
 
 #include "athena/activity/public/activity_factory.h"
 #include "athena/home/home_card_constants.h"
 #include "athena/home/home_card_impl.h"
 #include "athena/home/home_card_view.h"
@@ skipping 207 matching lines @@
 
   // Swipe down slightly; nothing has to be changed.
   generator.GestureScrollSequence(gfx::Point(x, bottom - 300),
                                   gfx::Point(x, bottom - 250),
                                   base::TimeDelta::FromSeconds(1),
                                   10);
   EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState());
   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());
 
   generator.GestureScrollSequence(gfx::Point(x, bottom - 40),
                                   gfx::Point(x, bottom - 300),
                                   base::TimeDelta::FromSeconds(1),
                                   10);
   EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState());
   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());
 }
 
 TEST_F(HomeCardTest, GesturesToFullDirectly) {
   ASSERT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
   ui::test::EventGenerator generator(root_window());
   gfx::Rect screen_rect(root_window()->bounds());
 
   const int bottom = screen_rect.bottom();
@@ skipping 56 matching lines @@
   contents_view->SetActivePage(
       contents_view->GetPageIndexForState(app_list::AppListModel::STATE_APPS));
   EXPECT_EQ(app_list::AppListModel::STATE_APPS, model->state());
   WindowManager::Get()->ExitOverview();
   WindowManager::Get()->EnterOverview();
   EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());
   EXPECT_EQ(app_list::AppListModel::STATE_START, model->state());
 }
 
 }  // namespace athena