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

Unified Diff: chrome/test/data/webui/ntp4.js

Issue 8689013: Remove TOUCH_UI specific new tab page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with trunk Created 9 years, 1 month 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
Index: chrome/test/data/webui/ntp4.js
diff --git a/chrome/test/data/webui/ntp4.js b/chrome/test/data/webui/ntp4.js
index 5ed222bddd2c56896c13649ca8d0cd696d87a3a4..4fd3cae8c61fcdfb14ac5bf4e88be81318b8191d 100644
--- a/chrome/test/data/webui/ntp4.js
+++ b/chrome/test/data/webui/ntp4.js
@@ -18,17 +18,9 @@ NTP4WebUITest.prototype = {
browsePreload: 'chrome://newtab',
};
-// TODO(danakj): Fix this test to work with the TOUCH_UI version of NTP.
-// http://crbug.com/99895
-GEN('#if defined(TOUCH_UI)');
-GEN('#define MAYBE_TestBrowsePages DISABLED_TestBrowsePages');
-GEN('#else');
-GEN('#define MAYBE_TestBrowsePages TestBrowsePages');
-GEN('#endif');
-
// Test loading new tab page and selecting each card doesn't have console
// errors.
-TEST_F('NTP4WebUITest', 'MAYBE_TestBrowsePages', function() {
+TEST_F('NTP4WebUITest', 'TestBrowsePages', function() {
// This tests the ntp4 new tab page which is not used on touch builds.
var cardSlider = ntp4.getCardSlider();
assertNotEquals(null, cardSlider);
« chrome/browser/ui/webui/ntp/new_tab_ui.cc ('K') | « chrome/common/chrome_switches.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698