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

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

Issue 10844005: [Sync] Refactor GetEncryptedTypes usage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase + add dcheck 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 4630511ff097ca1cdd85130439ec9cf129fff4a2..d20016ca943c861c96a44c5c6e73cefd8e831301 100644
--- a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
@@ -41,7 +41,6 @@
#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 {
@@ -346,19 +345,12 @@ 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.
@@ -573,7 +565,6 @@ 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) {
« no previous file with comments | « chrome/browser/sync/glue/typed_url_model_associator.cc ('k') | sync/engine/apply_updates_command_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698