trying to fix bookmarks unit test -- null check bookmarksFile, xpcshell doesn't know about it.

This commit is contained in:
bryner%brianryner.com 2005-12-10 04:40:52 +00:00
Родитель 9ac485cb00
Коммит b0fc96733f
1 изменённых файлов: 13 добавлений и 11 удалений

Просмотреть файл

@ -268,18 +268,20 @@ nsNavBookmarks::InitRoots()
nsCOMPtr<nsIFile> bookmarksFile;
rv = NS_GetSpecialDirectory(NS_APP_BOOKMARKS_50_FILE,
getter_AddRefs(bookmarksFile));
PRBool bookmarksFileExists;
rv = bookmarksFile->Exists(&bookmarksFileExists);
if (NS_SUCCEEDED(rv) && bookmarksFileExists) {
nsCOMPtr<nsIIOService> ioservice = do_GetService(
if (bookmarksFile) {
PRBool bookmarksFileExists;
rv = bookmarksFile->Exists(&bookmarksFileExists);
if (NS_SUCCEEDED(rv) && bookmarksFileExists) {
nsCOMPtr<nsIIOService> ioservice = do_GetService(
"@mozilla.org/network/io-service;1", &rv);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIURI> bookmarksFileURI;
rv = ioservice->NewFileURI(bookmarksFile,
getter_AddRefs(bookmarksFileURI));
NS_ENSURE_SUCCESS(rv, rv);
rv = ImportBookmarksHTMLInternal(bookmarksFileURI, PR_FALSE);
NS_ENSURE_SUCCESS(rv, rv);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIURI> bookmarksFileURI;
rv = ioservice->NewFileURI(bookmarksFile,
getter_AddRefs(bookmarksFileURI));
NS_ENSURE_SUCCESS(rv, rv);
rv = ImportBookmarksHTMLInternal(bookmarksFileURI, PR_FALSE);
NS_ENSURE_SUCCESS(rv, rv);
}
}
}
return NS_OK;