Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4424)

Unified Diff: chrome/browser/history/thumbnail_database_unittest.cc

Issue 24989006: Disable recovery test for USE_SYSTEM_SQLITE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | sql/recovery.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/history/thumbnail_database_unittest.cc
diff --git a/chrome/browser/history/thumbnail_database_unittest.cc b/chrome/browser/history/thumbnail_database_unittest.cc
index bc1a25ae4d86524011ba65e8c787d677b2673b2a..bb789a0596b8f2e9b91b2af71d71f3ac4cfc6aff 100644
--- a/chrome/browser/history/thumbnail_database_unittest.cc
+++ b/chrome/browser/history/thumbnail_database_unittest.cc
@@ -17,6 +17,7 @@
#include "chrome/common/chrome_paths.h"
#include "chrome/test/base/testing_profile.h"
#include "sql/connection.h"
+#include "sql/recovery.h" // For FullRecoverySupported().
#include "sql/statement.h"
#include "sql/test/scoped_error_ignorer.h"
#include "sql/test/test_helpers.h"
@@ -839,6 +840,15 @@ TEST_F(ThumbnailDatabaseTest, Version7) {
}
TEST_F(ThumbnailDatabaseTest, Recovery) {
+ // This code tests the recovery module in concert with Chromium's
+ // custom recover virtual table. Under USE_SYSTEM_SQLITE, this is
+ // not available. This is detected dynamically because corrupt
+ // databases still need to be handled, perhaps by Raze(), and the
+ // recovery module is an obvious layer to abstract that to.
+ // TODO(shess): Handle that case for real!
+ if (!sql::Recovery::FullRecoverySupported())
+ return;
+
chrome::FaviconID id1, id2;
GURL page_url1("http://www.google.com");
GURL page_url2("http://news.google.com");
« no previous file with comments | « no previous file | sql/recovery.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698