Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(448)

Unified Diff: athena/home/athena_start_page_view_unittest.cc

Issue 483033003: [Athena] Add status icons and system time to the centered home card (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/home/athena_start_page_view.cc ('k') | athena/system/background_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/home/athena_start_page_view_unittest.cc
diff --git a/athena/home/athena_start_page_view_unittest.cc b/athena/home/athena_start_page_view_unittest.cc
index 5e5551ba8d1bbc72137e0d583f6efabf1721a974..cc895a66ab7367a2abe17b7247d228c8ef1d4bbc 100644
--- a/athena/home/athena_start_page_view_unittest.cc
+++ b/athena/home/athena_start_page_view_unittest.cc
@@ -5,7 +5,7 @@
#include "athena/home/athena_start_page_view.h"
#include "athena/home/home_card_constants.h"
-#include "base/command_line.h"
+#include "athena/test/athena_test_base.h"
#include "base/format_macros.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
@@ -16,7 +16,6 @@
#include "ui/app_list/views/search_box_view.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/views/controls/textfield/textfield.h"
-#include "ui/views/test/views_test_base.h"
namespace athena {
@@ -41,16 +40,14 @@ class AthenaTestViewDelegate : public app_list::test::AppListTestViewDelegate {
DISALLOW_COPY_AND_ASSIGN(AthenaTestViewDelegate);
};
-class AthenaStartPageViewTest : public views::ViewsTestBase {
+class AthenaStartPageViewTest : public test::AthenaTestBase {
public:
AthenaStartPageViewTest() {}
virtual ~AthenaStartPageViewTest() {}
// testing::Test:
virtual void SetUp() OVERRIDE {
- views::ViewsTestBase::SetUp();
- base::CommandLine::ForCurrentProcess()->AppendSwitch(
- app_list::switches::kEnableExperimentalAppList);
+ test::AthenaTestBase::SetUp();
app_list::test::AppListTestModel* model = view_delegate_.GetTestModel();
for (size_t i = 0; i < kNumApps; ++i) {
model->AddItem(new app_list::test::AppListTestModel::AppListTestItem(
@@ -62,7 +59,7 @@ class AthenaStartPageViewTest : public views::ViewsTestBase {
}
virtual void TearDown() OVERRIDE {
view_.reset();
- views::ViewsTestBase::TearDown();
+ test::AthenaTestBase::TearDown();
}
protected:
« no previous file with comments | « athena/home/athena_start_page_view.cc ('k') | athena/system/background_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698