| Index: sync/internal_api/sync_encryption_handler_impl.cc
|
| diff --git a/sync/internal_api/sync_encryption_handler_impl.cc b/sync/internal_api/sync_encryption_handler_impl.cc
|
| index 2e28e75a83f008a0e68b0d19a685508c21b753d5..9e10026cfec4b330a4f0ff50fa837d6b77c141ae 100644
|
| --- a/sync/internal_api/sync_encryption_handler_impl.cc
|
| +++ b/sync/internal_api/sync_encryption_handler_impl.cc
|
| @@ -11,16 +11,16 @@
|
| #include "base/bind.h"
|
| #include "base/json/json_string_value_serializer.h"
|
| #include "base/message_loop.h"
|
| -#include "base/time.h"
|
| -#include "base/tracked_objects.h"
|
| #include "base/metrics/histogram.h"
|
| +#include "base/time/time.h"
|
| +#include "base/tracked_objects.h"
|
| #include "sync/internal_api/public/read_node.h"
|
| #include "sync/internal_api/public/read_transaction.h"
|
| #include "sync/internal_api/public/user_share.h"
|
| #include "sync/internal_api/public/util/experiments.h"
|
| +#include "sync/internal_api/public/util/sync_string_conversions.h"
|
| #include "sync/internal_api/public/write_node.h"
|
| #include "sync/internal_api/public/write_transaction.h"
|
| -#include "sync/internal_api/public/util/sync_string_conversions.h"
|
| #include "sync/protocol/encryption.pb.h"
|
| #include "sync/protocol/nigori_specifics.pb.h"
|
| #include "sync/protocol/sync.pb.h"
|
|
|