summaryrefslogtreecommitdiffstats
path: root/chrome/browser/bookmarks
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-20 20:42:19 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-20 20:42:19 +0000
commitf9dec948e612a87167f6c7068ebfd1c53b1ac7ba (patch)
tree5b9625452d76d956cb4ab108bc712b10b5d68709 /chrome/browser/bookmarks
parentbc12f05d2baf5a3f2aa8f084fbad48e42ef5a1c8 (diff)
downloadchromium_src-f9dec948e612a87167f6c7068ebfd1c53b1ac7ba.zip
chromium_src-f9dec948e612a87167f6c7068ebfd1c53b1ac7ba.tar.gz
chromium_src-f9dec948e612a87167f6c7068ebfd1c53b1ac7ba.tar.bz2
Make TestingProfile use ScopedTempDir.
Add some logic that tries to recover from common errors that happen on the bots. We need to CHECK in really bad cases because otherwise we'd end up writing to places where we should never write, like the filesystem root. TEST=unit_tests and others BUG=51833 Review URL: http://codereview.chromium.org/3133031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56909 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks')
-rw-r--r--chrome/browser/bookmarks/bookmark_drag_data_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc b/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc
index d9bf74d..8da227e 100644
--- a/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc
@@ -100,7 +100,7 @@ TEST_F(BookmarkDragDataTest, URL) {
EXPECT_TRUE(read_data.GetFirstNode(&profile) == node);
// Make sure asking for the node with a different profile returns NULL.
- TestingProfile profile2(1);
+ TestingProfile profile2;
EXPECT_TRUE(read_data.GetFirstNode(&profile2) == NULL);
// Writing should also put the URL and title on the clipboard.
@@ -146,7 +146,7 @@ TEST_F(BookmarkDragDataTest, Group) {
EXPECT_TRUE(g12 == r_g12);
// A different profile should return NULL for the node.
- TestingProfile profile2(1);
+ TestingProfile profile2;
EXPECT_TRUE(read_data.GetFirstNode(&profile2) == NULL);
}