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

Unified Diff: chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc

Issue 9567022: Reinitialize the cookie database if the meta table gets corrupted. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move things around a bit for a slightly smaller diff. Created 8 years, 10 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
Index: chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc
diff --git a/chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc b/chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc
index 4b9acb904bf4ecde2d92ce75cd8b2d5962319f3f..4e8465c86d32567fd8ba6814e7704717f96e4f08 100644
--- a/chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc
+++ b/chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc
@@ -16,6 +16,8 @@
#include "chrome/common/chrome_constants.h"
#include "content/test/test_browser_thread.h"
#include "googleurl/src/gurl.h"
+#include "sql/connection.h"
+#include "sql/meta_table.h"
#include "testing/gtest/include/gtest/gtest.h"
using content::BrowserThread;
@@ -137,6 +139,49 @@ TEST_F(SQLitePersistentCookieStoreTest, RemoveOnDestruction) {
temp_dir_.path().Append(chrome::kCookieFilename)));
}
+TEST_F(SQLitePersistentCookieStoreTest, TestInvalidMetaTableRecovery) {
+ InitializeStore(false);
+ AddCookie("A", "B", "http://foo.bar", "/", base::Time::Now());
+ DestroyStore();
+
+ // Load up the store and verify that it has good data in it.
+ std::vector<net::CookieMonster::CanonicalCookie*> cookies;
+ CreateAndLoad(false, &cookies);
+ ASSERT_EQ(1U, cookies.size());
+ ASSERT_STREQ("http://foo.bar", cookies[0]->Domain().c_str());
+ ASSERT_STREQ("A", cookies[0]->Name().c_str());
+ ASSERT_STREQ("B", cookies[0]->Value().c_str());
+ DestroyStore();
+ STLDeleteContainerPointers(cookies.begin(), cookies.end());
+ cookies.clear();
+
+ // Now corrupt the meta table.
+ {
+ sql::Connection db;
+ ASSERT_TRUE(db.Open(temp_dir_.path().Append(chrome::kCookieFilename)));
+ sql::MetaTable meta_table_;
+ meta_table_.Init(&db, 0, 0);
+ meta_table_.SetVersionNumber(0);
+ meta_table_.SetCompatibleVersionNumber(0);
+ db.Close();
+ }
+
+ // Upon loading, the database should be reset to a good, blank state.
+ CreateAndLoad(false, &cookies);
+ ASSERT_EQ(0U, cookies.size());
+
+ // Verify that, after, recovery, the database persists properly.
+ AddCookie("X", "Y", "http://foo.bar", "/", base::Time::Now());
+ DestroyStore();
+ CreateAndLoad(false, &cookies);
+ ASSERT_EQ(1U, cookies.size());
+ ASSERT_STREQ("http://foo.bar", cookies[0]->Domain().c_str());
+ ASSERT_STREQ("X", cookies[0]->Name().c_str());
+ ASSERT_STREQ("Y", cookies[0]->Value().c_str());
+ STLDeleteContainerPointers(cookies.begin(), cookies.end());
+ cookies.clear();
+}
+
// Test if data is stored as expected in the SQLite database.
TEST_F(SQLitePersistentCookieStoreTest, TestPersistance) {
InitializeStore(false);

Powered by Google App Engine
This is Rietveld 408576698