diff options
| author | rbyers@chromium.org <rbyers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-30 15:43:26 +0000 |
|---|---|---|
| committer | rbyers@chromium.org <rbyers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-30 15:43:26 +0000 |
| commit | c3b8b5c81fda90cd6bb92ab4f147ade49a38bcf1 (patch) | |
| tree | 399504a6a1a9a2bec27e617a4a04e571d05ba9a5 /chrome/test/data/webui | |
| parent | 73e54861ac92cded191ff6594e54d62941e2cfdb (diff) | |
| download | chromium_src-c3b8b5c81fda90cd6bb92ab4f147ade49a38bcf1.zip chromium_src-c3b8b5c81fda90cd6bb92ab4f147ade49a38bcf1.tar.gz chromium_src-c3b8b5c81fda90cd6bb92ab4f147ade49a38bcf1.tar.bz2 | |
Remove TOUCH_UI specific new tab page.
Also remove and clean-up the remaining vestiges of NTP3 support (they were left n the code just for touch_ntp which was built against them).
BUG=105046
TEST=NTP4WebUITest.TestBrowsePages
Review URL: http://codereview.chromium.org/8689013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112229 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/data/webui')
| -rw-r--r-- | chrome/test/data/webui/ntp4.js | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/chrome/test/data/webui/ntp4.js b/chrome/test/data/webui/ntp4.js index 5ed222b..4fd3cae 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); |