summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prerender/prerender_unittest.cc
diff options
context:
space:
mode:
authorscottmg@google.com <scottmg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-03 20:26:48 +0000
committerscottmg@google.com <scottmg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-03 20:26:48 +0000
commit1852a6356c926f7f0d5d9afe95800f78b3b926f8 (patch)
tree9ca1ad8fd6972c1a2bfdb3f5d2926739b5012cd5 /chrome/browser/prerender/prerender_unittest.cc
parentf5d2db40642fc31c9592dfb839389166f4057a13 (diff)
downloadchromium_src-1852a6356c926f7f0d5d9afe95800f78b3b926f8.zip
chromium_src-1852a6356c926f7f0d5d9afe95800f78b3b926f8.tar.gz
chromium_src-1852a6356c926f7f0d5d9afe95800f78b3b926f8.tar.bz2
(re-)enable prerender unit tests on win_aura
R=gavinp@chromium.org BUG=128578 Review URL: https://codereview.chromium.org/11299211 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170799 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prerender/prerender_unittest.cc')
-rw-r--r--chrome/browser/prerender/prerender_unittest.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/chrome/browser/prerender/prerender_unittest.cc b/chrome/browser/prerender/prerender_unittest.cc
index cacce16..b530a28 100644
--- a/chrome/browser/prerender/prerender_unittest.cc
+++ b/chrome/browser/prerender/prerender_unittest.cc
@@ -330,8 +330,6 @@ class PrerenderTest : public testing::Test {
int last_prerender_id_;
};
-// TODO(scottmg): http://crbug.com/128578
-#if !(defined(OS_WIN) && defined(USE_AURA))
TEST_F(PrerenderTest, FoundTest) {
GURL url("http://www.google.com/");
DummyPrerenderContents* prerender_contents =
@@ -1198,6 +1196,4 @@ TEST_F(PrerenderTest, LinkManagerCancelThenAddAgain) {
EXPECT_FALSE(IsEmptyPrerenderLinkManager());
}
-#endif // !(defined(OS_WIN) && defined(USE_AURA))
-
} // namespace prerender