summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-05 17:06:57 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-05 17:06:57 +0000
commitb601e9f8602e1c27491164bbac66e581222f9d36 (patch)
tree22b21e8cae1d3b6acb79128bc9c3e151cb9e0cd4 /chrome
parent3bd3b2be39ff89c234d33f0ee9620a80258cc2ca (diff)
downloadchromium_src-b601e9f8602e1c27491164bbac66e581222f9d36.zip
chromium_src-b601e9f8602e1c27491164bbac66e581222f9d36.tar.gz
chromium_src-b601e9f8602e1c27491164bbac66e581222f9d36.tar.bz2
Re-enable the NavigationControllerHistory test.
Review URL: http://codereview.chromium.org/62040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13136 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/navigation_controller_unittest.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/chrome/browser/navigation_controller_unittest.cc b/chrome/browser/navigation_controller_unittest.cc
index 6a11b3f..eefde42 100644
--- a/chrome/browser/navigation_controller_unittest.cc
+++ b/chrome/browser/navigation_controller_unittest.cc
@@ -1355,9 +1355,6 @@ TEST_F(NavigationControllerTest, SameSubframe) {
EXPECT_EQ(controller()->GetLastCommittedEntryIndex(), 0);
}
-/* TODO(brettw) These test pass on my local machine but fail on the buildbot
- cleaning up the directory after they run. This should be fixed.
-
// A basic test case. Navigates to a single url, and make sure the history
// db matches.
TEST_F(NavigationControllerHistoryTest, Basic) {
@@ -1431,5 +1428,4 @@ TEST_F(NavigationControllerHistoryTest, NavigationPruning) {
nav.set_url(url2);
session_helper_.AssertNavigationEquals(nav,
windows_[0]->tabs[0]->navigations[1]);
-}
-*/ \ No newline at end of file
+} \ No newline at end of file