| Index: components/sync/core/base_transaction.cc
|
| diff --git a/sync/internal_api/base_transaction.cc b/components/sync/core/base_transaction.cc
|
| similarity index 52%
|
| rename from sync/internal_api/base_transaction.cc
|
| rename to components/sync/core/base_transaction.cc
|
| index 6fae52c09ca2f2e3bccc062017060fb072b5c4e2..ca61433b5c0ac49182e81559c2404d949f59b7f7 100644
|
| --- a/sync/internal_api/base_transaction.cc
|
| +++ b/components/sync/core/base_transaction.cc
|
| @@ -2,34 +2,31 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "sync/internal_api/public/base_transaction.h"
|
| +#include "components/sync/core/base_transaction.h"
|
|
|
| -#include "sync/syncable/directory.h"
|
| -#include "sync/syncable/nigori_handler.h"
|
| -#include "sync/util/cryptographer.h"
|
| +#include "components/sync/base/cryptographer.h"
|
| +#include "components/sync/syncable/directory.h"
|
| +#include "components/sync/syncable/nigori_handler.h"
|
|
|
| namespace syncer {
|
|
|
| //////////////////////////////////////////////////////////////////////////
|
| // BaseTransaction member definitions
|
| -BaseTransaction::BaseTransaction(UserShare* share)
|
| - : user_share_(share) {
|
| +BaseTransaction::BaseTransaction(UserShare* share) : user_share_(share) {
|
| DCHECK(share && share->directory.get());
|
| }
|
|
|
| -BaseTransaction::~BaseTransaction() {
|
| -}
|
| +BaseTransaction::~BaseTransaction() {}
|
|
|
| Cryptographer* BaseTransaction::GetCryptographer() const {
|
| return GetDirectory()->GetCryptographer(this->GetWrappedTrans());
|
| }
|
|
|
| ModelTypeSet BaseTransaction::GetEncryptedTypes() const {
|
| - syncable::NigoriHandler* nigori_handler =
|
| - GetDirectory()->GetNigoriHandler();
|
| - return nigori_handler ?
|
| - nigori_handler->GetEncryptedTypes(this->GetWrappedTrans()) :
|
| - ModelTypeSet();
|
| + syncable::NigoriHandler* nigori_handler = GetDirectory()->GetNigoriHandler();
|
| + return nigori_handler
|
| + ? nigori_handler->GetEncryptedTypes(this->GetWrappedTrans())
|
| + : ModelTypeSet();
|
| }
|
|
|
| } // namespace syncer
|
|
|