| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/test/ui/ui_test.h" | 5 #include "chrome/test/ui/ui_test.h" |
| 6 | 6 |
| 7 #include "base/test/test_timeouts.h" | 7 #include "base/test/test_timeouts.h" |
| 8 #include "chrome/app/chrome_command_ids.h" | 8 #include "chrome/app/chrome_command_ids.h" |
| 9 #include "chrome/browser/dom_ui/new_tab_ui.h" | 9 #include "chrome/browser/dom_ui/new_tab_ui.h" |
| 10 #include "chrome/browser/prefs/pref_value_store.h" | 10 #include "chrome/browser/prefs/pref_value_store.h" |
| 11 #include "chrome/browser/sync/signin_manager.h" | 11 #include "chrome/browser/sync/signin_manager.h" |
| 12 #include "chrome/common/chrome_switches.h" | 12 #include "chrome/common/chrome_switches.h" |
| 13 #include "chrome/common/json_pref_store.h" | 13 #include "chrome/common/json_pref_store.h" |
| 14 #include "chrome/common/pref_names.h" | 14 #include "chrome/common/pref_names.h" |
| 15 #include "chrome/common/url_constants.h" | 15 #include "chrome/common/url_constants.h" |
| 16 #include "chrome/test/automation/browser_proxy.h" | 16 #include "chrome/test/automation/browser_proxy.h" |
| 17 #include "chrome/test/automation/tab_proxy.h" | 17 #include "chrome/test/automation/tab_proxy.h" |
| 18 #include "chrome/test/automation/window_proxy.h" | 18 #include "chrome/test/automation/window_proxy.h" |
| 19 #include "chrome/test/testing_pref_service.h" | 19 #include "chrome/test/testing_pref_service.h" |
| 20 | 20 |
| 21 // This tests are failing consistently on "Linux (dbg)" and "Mac (dbg)" bots. |
| 22 // See http://crbug.com/72286. |
| 23 #ifndef OS_WIN |
| 24 #define NavBeforeNTPCommits FAILS_NavBeforeNTPCommits |
| 25 #define AboutHangInNTP FAILS_AboutHangInNTP |
| 26 #define NTPHasThumbnails FAILS_NTPHasThumbnails |
| 27 #endif |
| 28 |
| 21 class NewTabUITest : public UITest { | 29 class NewTabUITest : public UITest { |
| 22 public: | 30 public: |
| 23 NewTabUITest() { | 31 NewTabUITest() { |
| 24 dom_automation_enabled_ = true; | 32 dom_automation_enabled_ = true; |
| 25 // Set home page to the empty string so that we can set the home page using | 33 // Set home page to the empty string so that we can set the home page using |
| 26 // preferences. | 34 // preferences. |
| 27 set_homepage(""); | 35 set_homepage(""); |
| 28 | 36 |
| 29 // Setup the DEFAULT_THEME profile (has fake history entries). | 37 // Setup the DEFAULT_THEME profile (has fake history entries). |
| 30 set_template_user_data(UITest::ComputeTypicalUserDataSource( | 38 set_template_user_data(UITest::ComputeTypicalUserDataSource( |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 ASSERT_EQ(0, prefs->GetInteger(prefs::kNTPPrefVersion)); | 183 ASSERT_EQ(0, prefs->GetInteger(prefs::kNTPPrefVersion)); |
| 176 | 184 |
| 177 bool migrated = NewTabUI::UpdateUserPrefsVersion(prefs.get()); | 185 bool migrated = NewTabUI::UpdateUserPrefsVersion(prefs.get()); |
| 178 ASSERT_TRUE(migrated); | 186 ASSERT_TRUE(migrated); |
| 179 ASSERT_EQ(NewTabUI::current_pref_version(), | 187 ASSERT_EQ(NewTabUI::current_pref_version(), |
| 180 prefs->GetInteger(prefs::kNTPPrefVersion)); | 188 prefs->GetInteger(prefs::kNTPPrefVersion)); |
| 181 | 189 |
| 182 migrated = NewTabUI::UpdateUserPrefsVersion(prefs.get()); | 190 migrated = NewTabUI::UpdateUserPrefsVersion(prefs.get()); |
| 183 ASSERT_FALSE(migrated); | 191 ASSERT_FALSE(migrated); |
| 184 } | 192 } |
| OLD | NEW |