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

Unified Diff: chrome/browser/sync/syncable/nigori_util_unittest.cc

Issue 7587009: sync: add DEPS files to subdirs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix include Created 9 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
« no previous file with comments | « chrome/browser/sync/syncable/nigori_util.cc ('k') | chrome/browser/sync/syncable/syncable.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/syncable/nigori_util_unittest.cc
diff --git a/chrome/browser/sync/syncable/nigori_util_unittest.cc b/chrome/browser/sync/syncable/nigori_util_unittest.cc
deleted file mode 100644
index d7d6789b7abc1659ef4e8e66a029932d607148fd..0000000000000000000000000000000000000000
--- a/chrome/browser/sync/syncable/nigori_util_unittest.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/sync/util/cryptographer.h"
-#include "chrome/browser/sync/syncable/nigori_util.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace syncable {
-
-typedef testing::Test NigoriUtilTest;
-
-TEST_F(NigoriUtilTest, NigoriEncryptionTypes) {
- browser_sync::Cryptographer cryptographer;
- sync_pb::NigoriSpecifics nigori;
- ModelTypeSet encrypted_types;
- encrypted_types.insert(syncable::PASSWORDS);
- FillNigoriEncryptedTypes(encrypted_types, &nigori);
- cryptographer.SetEncryptedTypes(nigori);
- ModelTypeSet test_types = cryptographer.GetEncryptedTypes();
- EXPECT_EQ(encrypted_types, test_types);
-
- for (int i = FIRST_REAL_MODEL_TYPE; i < MODEL_TYPE_COUNT; ++i) {
- encrypted_types.insert(ModelTypeFromInt(i));
- }
- FillNigoriEncryptedTypes(encrypted_types, &nigori);
- cryptographer.SetEncryptedTypes(nigori);
- test_types = cryptographer.GetEncryptedTypes();
- encrypted_types.erase(syncable::NIGORI); // Should not get set.
- EXPECT_EQ(encrypted_types, test_types);
-
- encrypted_types.erase(syncable::BOOKMARKS);
- encrypted_types.erase(syncable::SESSIONS);
- FillNigoriEncryptedTypes(encrypted_types, &nigori);
- cryptographer.SetEncryptedTypes(nigori);
- test_types = cryptographer.GetEncryptedTypes();
- EXPECT_EQ(encrypted_types, test_types);
-}
-
-// ProcessUnsyncedChangesForEncryption and other methods that rely on the syncer
-// are tested in apply_updates_command_unittest.cc
-
-} // namespace syncable
« no previous file with comments | « chrome/browser/sync/syncable/nigori_util.cc ('k') | chrome/browser/sync/syncable/syncable.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698