diff options
| author | dennisjeffrey@chromium.org <dennisjeffrey@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-30 17:11:33 +0000 |
|---|---|---|
| committer | dennisjeffrey@chromium.org <dennisjeffrey@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-30 17:11:33 +0000 |
| commit | 671c4db73b13469d6b8c27246f364b3ad0f6aa14 (patch) | |
| tree | 38a7fdf69a895d48f4db80aa63f5621c51d0232c | |
| parent | 22cba5b37130ed5be40d734da1dd05a5abf176c0 (diff) | |
| download | chromium_src-671c4db73b13469d6b8c27246f364b3ad0f6aa14.zip chromium_src-671c4db73b13469d6b8c27246f364b3ad0f6aa14.tar.gz chromium_src-671c4db73b13469d6b8c27246f364b3ad0f6aa14.tar.bz2 | |
Change NOTREACHED() to DLOG() in TextDatabaseManager::AddPageData.
It's possible that if Chrome's history is being updated (e.g., after
having navigated to a URL), and the browsing history is quickly
deleted before all history updates have been completely performed,
then a stale history update may be attempted, leading to a NOTREACHED
that was manifesting through pyauto automation. This CL changes
the NOTREACHED to a DLOG, preventing the browser process from dying
when this situation occurs.
BUG=88128,chromium-os:14394
TEST=None
Review URL: http://codereview.chromium.org/7981048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103482 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/history/text_database_manager.cc | 6 | ||||
| -rw-r--r-- | chrome/test/functional/PYAUTO_TESTS | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/chrome/browser/history/text_database_manager.cc b/chrome/browser/history/text_database_manager.cc index 1403ebe..df47bc7 100644 --- a/chrome/browser/history/text_database_manager.cc +++ b/chrome/browser/history/text_database_manager.cc @@ -292,7 +292,11 @@ bool TextDatabaseManager::AddPageData(const GURL& url, // We're supposed to update the visit database, so load the visit. VisitRow row; if (!visit_database_->GetRowForVisit(visit_id, &row)) { - NOTREACHED() << "Could not find requested visit #" << visit_id; + // This situation can occur if Chrome's history is in the process of + // being updated, and then the browsing history is deleted before all + // updates have been completely performed. In this case, a stale update + // to the database is attempted, leading to the warning below. + DLOG(WARNING) << "Could not find requested visit #" << visit_id; return false; } diff --git a/chrome/test/functional/PYAUTO_TESTS b/chrome/test/functional/PYAUTO_TESTS index 7da3d58..1a96360 100644 --- a/chrome/test/functional/PYAUTO_TESTS +++ b/chrome/test/functional/PYAUTO_TESTS @@ -84,9 +84,6 @@ # crbug.com/97369 '-autofill.AutofillTest.testNoDuplicatePhoneNumsInPrefs', # Browser crash when clearing browsing history and downloads together. - # crbug.com/88128 - '-browsing_data.BrowsingDataTest.testClearHistoryAndDownloads', - '-browsing_data.BrowsingDataTest.testClearingAccuracy', # crbug.com/97695 '-downloads.DownloadsTest.testBigZip', '-downloads.DownloadsTest.testFileRenaming', @@ -307,8 +304,6 @@ # crbug.com/81271 '-autofill.AutofillTest.testMergeAggregatedProfilesWithSameAddress', '-autofill.AutofillTest.testProfilesNotMergedWhenNoMinAddressData', - # Flaky: crosbug.com/14394 - '-browsing_data.BrowsingDataTest.testClearHistoryAndDownloads', # Downloads panel stays even after declining a download. # crosbug.com/14728 '-downloads.DownloadsTest.testDeclineDangerousDownload', |