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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/syncable/syncable_unittest.cc

Issue 10844005: [Sync] Refactor GetEncryptedTypes usage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Always trigger OnEncryptedTypesChanged on init Created 8 years, 4 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
« sync/internal_api/sync_encryption_handler_impl.cc ('K') | « sync/syncable/syncable_mock.cc ('k') | sync/test/engine/test_directory_setter_upper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/syncable/syncable_unittest.cc
diff --git a/sync/syncable/syncable_unittest.cc b/sync/syncable/syncable_unittest.cc
index cf34a94ec93eef46ec419698ce3602683cbbbd4e..389a1021c74c4a30935dee318525354a655e8f7f 100644
--- a/sync/syncable/syncable_unittest.cc
+++ b/sync/syncable/syncable_unittest.cc
@@ -106,8 +106,12 @@ class SyncableGeneralTest : public testing::Test {
const char SyncableGeneralTest::kIndexTestName[] = "IndexTest";
TEST_F(SyncableGeneralTest, General) {
- Directory dir(&encryptor_, &handler_, NULL,
- new InMemoryDirectoryBackingStore("SimpleTest"));
+ Directory dir(new InMemoryDirectoryBackingStore("SimpleTest"),
+ &handler_,
+ NULL,
+ NULL,
+ NULL);
+
ASSERT_EQ(OPENED, dir.Open(
"SimpleTest", &delegate_, NullTransactionObserver()));
@@ -207,8 +211,11 @@ TEST_F(SyncableGeneralTest, General) {
}
TEST_F(SyncableGeneralTest, ChildrenOps) {
- Directory dir(&encryptor_, &handler_, NULL,
- new InMemoryDirectoryBackingStore("SimpleTest"));
+ Directory dir(new InMemoryDirectoryBackingStore("SimpleTest"),
+ &handler_,
+ NULL,
+ NULL,
+ NULL);
ASSERT_EQ(OPENED, dir.Open(
"SimpleTest", &delegate_, NullTransactionObserver()));
@@ -281,8 +288,11 @@ TEST_F(SyncableGeneralTest, ClientIndexRebuildsProperly) {
// Test creating a new meta entry.
{
- Directory dir(&encryptor_, &handler_, NULL,
- new OnDiskDirectoryBackingStore(kIndexTestName, db_path_));
+ Directory dir(new OnDiskDirectoryBackingStore(kIndexTestName, db_path_),
+ &handler_,
+ NULL,
+ NULL,
+ NULL);
ASSERT_EQ(OPENED, dir.Open(kIndexTestName, &delegate_,
NullTransactionObserver()));
{
@@ -299,8 +309,11 @@ TEST_F(SyncableGeneralTest, ClientIndexRebuildsProperly) {
// The DB was closed. Now reopen it. This will cause index regeneration.
{
- Directory dir(&encryptor_, &handler_, NULL,
- new OnDiskDirectoryBackingStore(kIndexTestName, db_path_));
+ Directory dir(new OnDiskDirectoryBackingStore(kIndexTestName, db_path_),
+ &handler_,
+ NULL,
+ NULL,
+ NULL);
ASSERT_EQ(OPENED, dir.Open(kIndexTestName,
&delegate_, NullTransactionObserver()));
@@ -321,8 +334,11 @@ TEST_F(SyncableGeneralTest, ClientIndexRebuildsDeletedProperly) {
// Test creating a deleted, unsynced, server meta entry.
{
- Directory dir(&encryptor_, &handler_, NULL,
- new OnDiskDirectoryBackingStore(kIndexTestName, db_path_));
+ Directory dir(new OnDiskDirectoryBackingStore(kIndexTestName, db_path_),
+ &handler_,
+ NULL,
+ NULL,
+ NULL);
ASSERT_EQ(OPENED, dir.Open(kIndexTestName, &delegate_,
NullTransactionObserver()));
{
@@ -341,8 +357,11 @@ TEST_F(SyncableGeneralTest, ClientIndexRebuildsDeletedProperly) {
// The DB was closed. Now reopen it. This will cause index regeneration.
// Should still be present and valid in the client tag index.
{
- Directory dir(&encryptor_, &handler_, NULL,
- new OnDiskDirectoryBackingStore(kIndexTestName, db_path_));
+ Directory dir(new OnDiskDirectoryBackingStore(kIndexTestName, db_path_),
+ &handler_,
+ NULL,
+ NULL,
+ NULL);
ASSERT_EQ(OPENED, dir.Open(kIndexTestName, &delegate_,
NullTransactionObserver()));
@@ -357,8 +376,11 @@ TEST_F(SyncableGeneralTest, ClientIndexRebuildsDeletedProperly) {
}
TEST_F(SyncableGeneralTest, ToValue) {
- Directory dir(&encryptor_, &handler_, NULL,
- new InMemoryDirectoryBackingStore("SimpleTest"));
+ Directory dir(new InMemoryDirectoryBackingStore("SimpleTest"),
+ &handler_,
+ NULL,
+ NULL,
+ NULL);
ASSERT_EQ(OPENED, dir.Open(
"SimpleTest", &delegate_, NullTransactionObserver()));
@@ -407,8 +429,11 @@ class TestUnsaveableDirectory : public Directory {
TestUnsaveableDirectory(const std::string& dir_name,
const FilePath& backing_filepath)
- : Directory(&encryptor_, &handler_, NULL,
- new UnsaveableBackingStore(dir_name, backing_filepath)) {}
+ : Directory(new UnsaveableBackingStore(dir_name, backing_filepath),
+ &handler_,
+ NULL,
+ NULL,
+ NULL) {}
private:
FakeEncryptor encryptor_;
TestUnrecoverableErrorHandler handler_;
@@ -422,8 +447,11 @@ class SyncableDirectoryTest : public testing::Test {
static const char kName[];
virtual void SetUp() {
- dir_.reset(new Directory(&encryptor_, &handler_, NULL,
- new InMemoryDirectoryBackingStore(kName)));
+ dir_.reset(new Directory(new InMemoryDirectoryBackingStore(kName),
+ &handler_,
+ NULL,
+ NULL,
+ NULL));
ASSERT_TRUE(dir_.get());
ASSERT_EQ(OPENED, dir_->Open(kName, &delegate_,
NullTransactionObserver()));
@@ -1343,8 +1371,11 @@ class OnDiskSyncableDirectoryTest : public SyncableDirectoryTest {
file_path_ = temp_dir_.path().Append(
FILE_PATH_LITERAL("Test.sqlite3"));
file_util::Delete(file_path_, true);
- dir_.reset(new Directory(&encryptor_, &handler_, NULL,
- new OnDiskDirectoryBackingStore(kName, file_path_)));
+ dir_.reset(new Directory(new OnDiskDirectoryBackingStore(kName, file_path_),
+ &handler_,
+ NULL,
+ NULL,
+ NULL));
ASSERT_TRUE(dir_.get());
ASSERT_EQ(OPENED, dir_->Open(kName, &delegate_,
NullTransactionObserver()));
@@ -1359,8 +1390,12 @@ class OnDiskSyncableDirectoryTest : public SyncableDirectoryTest {
}
void ReloadDir() {
- dir_.reset(new Directory(&encryptor_, &handler_, NULL,
- new OnDiskDirectoryBackingStore(kName, file_path_)));
+ dir_.reset(new Directory(
+ new OnDiskDirectoryBackingStore(kName, file_path_),
+ &handler_,
+ NULL,
+ NULL,
+ NULL));
ASSERT_TRUE(dir_.get());
ASSERT_EQ(OPENED, dir_->Open(kName, &delegate_,
NullTransactionObserver()));
@@ -1517,8 +1552,12 @@ TEST_F(OnDiskSyncableDirectoryTest,
}
dir_->SaveChanges();
- dir_.reset(new Directory(&encryptor_, &handler_, NULL,
- new OnDiskDirectoryBackingStore(kName, file_path_)));
+ dir_.reset(new Directory(new OnDiskDirectoryBackingStore(kName, file_path_),
+ &handler_,
+ NULL,
+ NULL,
+ NULL));
+
ASSERT_TRUE(dir_.get());
ASSERT_EQ(OPENED, dir_->Open(kName, &delegate_, NullTransactionObserver()));
ASSERT_TRUE(dir_->good());
@@ -1728,7 +1767,11 @@ DirOpenResult SyncableDirectoryTest::SimulateSaveAndReloadDir() {
dir_->Close();
dir_.reset();
- dir_.reset(new Directory(&encryptor_, &handler_, NULL, saved_store));
+ dir_.reset(new Directory(saved_store,
+ &handler_,
+ NULL,
+ NULL,
+ NULL));
DirOpenResult result = dir_->OpenImpl(kName, &delegate_,
NullTransactionObserver());
@@ -1762,8 +1805,11 @@ TEST_F(SyncableDirectoryManagement, TestFileRelease) {
FilePath path = temp_dir_.path().Append(
Directory::kSyncDatabaseFilename);
- syncable::Directory dir(&encryptor_, &handler_, NULL,
- new OnDiskDirectoryBackingStore("ScopeTest", path));
+ syncable::Directory dir(new OnDiskDirectoryBackingStore("ScopeTest", path),
+ &handler_,
+ NULL,
+ NULL,
+ NULL);
DirOpenResult result =
dir.Open("ScopeTest", &delegate_, NullTransactionObserver());
ASSERT_EQ(result, OPENED);
@@ -1824,8 +1870,11 @@ TEST(SyncableDirectory, StressTransactions) {
TestUnrecoverableErrorHandler handler;
NullDirectoryChangeDelegate delegate;
std::string dirname = "stress";
- Directory dir(&encryptor, &handler, NULL,
- new InMemoryDirectoryBackingStore(dirname));
+ Directory dir(new InMemoryDirectoryBackingStore(dirname),
+ &handler,
+ NULL,
+ NULL,
+ NULL);
dir.Open(dirname, &delegate, NullTransactionObserver());
const int kThreadCount = 7;
« sync/internal_api/sync_encryption_handler_impl.cc ('K') | « sync/syncable/syncable_mock.cc ('k') | sync/test/engine/test_directory_setter_upper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698