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

Unified Diff: chrome/browser/sync/syncable/nigori_util.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.h ('k') | chrome/browser/sync/syncable/nigori_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/syncable/nigori_util.cc
diff --git a/chrome/browser/sync/syncable/nigori_util.cc b/chrome/browser/sync/syncable/nigori_util.cc
deleted file mode 100644
index 9010aa9968966fcbca6139b6ab5ed0ea9c8d19d8..0000000000000000000000000000000000000000
--- a/chrome/browser/sync/syncable/nigori_util.cc
+++ /dev/null
@@ -1,135 +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/syncable/nigori_util.h"
-
-#include <queue>
-#include <string>
-#include <vector>
-
-#include "chrome/browser/sync/engine/syncapi.h"
-#include "chrome/browser/sync/engine/syncer_util.h"
-#include "chrome/browser/sync/syncable/syncable.h"
-#include "chrome/browser/sync/util/cryptographer.h"
-
-namespace syncable {
-void FillNigoriEncryptedTypes(const ModelTypeSet& types,
- sync_pb::NigoriSpecifics* nigori) {
- DCHECK(nigori);
- nigori->set_encrypt_bookmarks(types.count(BOOKMARKS) > 0);
- nigori->set_encrypt_preferences(types.count(PREFERENCES) > 0);
- nigori->set_encrypt_autofill_profile(types.count(AUTOFILL_PROFILE) > 0);
- nigori->set_encrypt_autofill(types.count(AUTOFILL) > 0);
- nigori->set_encrypt_themes(types.count(THEMES) > 0);
- nigori->set_encrypt_typed_urls(types.count(TYPED_URLS) > 0);
- nigori->set_encrypt_extensions(types.count(EXTENSIONS) > 0);
- nigori->set_encrypt_search_engines(types.count(SEARCH_ENGINES) > 0);
- nigori->set_encrypt_sessions(types.count(SESSIONS) > 0);
- nigori->set_encrypt_apps(types.count(APPS) > 0);
-}
-
-bool ProcessUnsyncedChangesForEncryption(
- WriteTransaction* const trans,
- browser_sync::Cryptographer* cryptographer) {
- DCHECK(cryptographer->is_ready());
- syncable::ModelTypeSet encrypted_types = cryptographer->GetEncryptedTypes();
-
- // Get list of all datatypes with unsynced changes. It's possible that our
- // local changes need to be encrypted if encryption for that datatype was
- // just turned on (and vice versa). This should never affect passwords.
- std::vector<int64> handles;
- browser_sync::SyncerUtil::GetUnsyncedEntries(trans, &handles);
- for (size_t i = 0; i < handles.size(); ++i) {
- MutableEntry entry(trans, GET_BY_HANDLE, handles[i]);
- if (!sync_api::WriteNode::UpdateEntryWithEncryption(cryptographer,
- entry.Get(SPECIFICS),
- &entry)) {
- NOTREACHED();
- return false;
- }
- }
- return true;
-}
-
-bool VerifyUnsyncedChangesAreEncrypted(
- BaseTransaction* const trans,
- const ModelTypeSet& encrypted_types) {
- std::vector<int64> handles;
- browser_sync::SyncerUtil::GetUnsyncedEntries(trans, &handles);
- for (size_t i = 0; i < handles.size(); ++i) {
- Entry entry(trans, GET_BY_HANDLE, handles[i]);
- if (!entry.good()) {
- NOTREACHED();
- return false;
- }
- const sync_pb::EntitySpecifics& entry_specifics = entry.Get(SPECIFICS);
- ModelType type = entry.GetModelType();
- if (type == PASSWORDS)
- continue;
- if (encrypted_types.count(type) > 0 &&
- !entry_specifics.has_encrypted()) {
- // This datatype requires encryption but this data is not encrypted.
- return false;
- }
- }
- return true;
-}
-
-// Mainly for testing.
-bool VerifyDataTypeEncryption(BaseTransaction* const trans,
- browser_sync::Cryptographer* cryptographer,
- ModelType type,
- bool is_encrypted) {
- if (type == PASSWORDS || type == NIGORI) {
- NOTREACHED();
- return true;
- }
- std::string type_tag = ModelTypeToRootTag(type);
- Entry type_root(trans, GET_BY_SERVER_TAG, type_tag);
- if (!type_root.good()) {
- NOTREACHED();
- return false;
- }
-
- std::queue<Id> to_visit;
- Id id_string =
- trans->directory()->GetFirstChildId(trans, type_root.Get(ID));
- to_visit.push(id_string);
- while (!to_visit.empty()) {
- id_string = to_visit.front();
- to_visit.pop();
- if (id_string.IsRoot())
- continue;
-
- Entry child(trans, GET_BY_ID, id_string);
- if (!child.good()) {
- NOTREACHED();
- return false;
- }
- if (child.Get(IS_DIR)) {
- // Traverse the children.
- to_visit.push(
- trans->directory()->GetFirstChildId(trans, child.Get(ID)));
- }
- const sync_pb::EntitySpecifics& specifics = child.Get(SPECIFICS);
- DCHECK_EQ(type, child.GetModelType());
- DCHECK_EQ(type, GetModelTypeFromSpecifics(specifics));
- // We don't encrypt the server's permanent items.
- if (child.Get(UNIQUE_SERVER_TAG).empty()) {
- if (specifics.has_encrypted() != is_encrypted)
- return false;
- if (specifics.has_encrypted()) {
- if (child.Get(NON_UNIQUE_NAME) != kEncryptedString)
- return false;
- if (!cryptographer->CanDecryptUsingDefaultKey(specifics.encrypted()))
- return false;
- }
- }
- // Push the successor.
- to_visit.push(child.Get(NEXT_ID));
- }
- return true;
-}
-
-} // namespace syncable
« no previous file with comments | « chrome/browser/sync/syncable/nigori_util.h ('k') | chrome/browser/sync/syncable/nigori_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698