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

Unified Diff: chrome/browser/sync/profile_sync_service_bookmark_unittest.cc

Issue 10827266: [Sync] Add SyncEncryptionHandler (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix 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
Index: chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
index d16b5c5905b361a47b81f32cceb5615c11212311..4630511ff097ca1cdd85130439ec9cf129fff4a2 100644
--- a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
@@ -41,6 +41,7 @@
#include "sync/test/engine/test_id_factory.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "sync/test/fake_sync_encryption_handler.h"
namespace browser_sync {
@@ -345,12 +346,19 @@ class ProfileSyncServiceBookmarkTest : public testing::Test {
virtual void SetUp() {
test_user_share_.SetUp();
+ SetUpEncryption();
}
virtual void TearDown() {
test_user_share_.TearDown();
}
+ void SetUpEncryption() {
+ syncer::ReadTransaction trans(FROM_HERE, test_user_share_.user_share());
+ fake_encryption_handler_.set_cryptographer(trans.GetCryptographer());
+ trans.GetCryptographer()->SetNigoriHandler(&fake_encryption_handler_);
+ }
+
// Load (or re-load) the bookmark model. |load| controls use of the
// bookmarks file on disk. |save| controls whether the newly loaded
// bookmark model will write out a bookmark file as it goes.
@@ -565,6 +573,7 @@ class ProfileSyncServiceBookmarkTest : public testing::Test {
syncer::TestUserShare test_user_share_;
scoped_ptr<BookmarkChangeProcessor> change_processor_;
StrictMock<DataTypeErrorHandlerMock> mock_error_handler_;
+ syncer::FakeSyncEncryptionHandler fake_encryption_handler_;
};
TEST_F(ProfileSyncServiceBookmarkTest, InitialState) {
@@ -1473,8 +1482,8 @@ TEST_F(ProfileSyncServiceBookmarkTestWithData,
StopSync();
// Nuke the sync DB and reload.
- test_user_share_.TearDown();
- test_user_share_.SetUp();
+ TearDown();
+ SetUp();
StartSync();
« no previous file with comments | « chrome/browser/sync/profile_sync_service.cc ('k') | chrome/browser/sync/profile_sync_service_password_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698