chrome/browser/sync/syncable/syncable.cc - Issue 6465005: [Sync] Initial support for encrypting any datatype (no UI hookup yet).

Side by Side Diff: chrome/browser/sync/syncable/syncable.cc

Issue 6465005: [Sync] Initial support for encrypting any datatype (no UI hookup yet). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Comments. Rest of unit tests. Created 9 years, 10 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 unified diff | Download patch | Annotate | Revision Log

« chrome/browser/sync/syncable/nigori_util.cc ('K') | « chrome/browser/sync/syncable/nigori_util_unittest.cc ('k') | chrome/browser/sync/util/cryptographer.h » ('j') | chrome/test/live_sync/multiple_client_live_sessions_sync_test.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/sync/syncable/syncable.h"	5 #include "chrome/browser/sync/syncable/syncable.h"

6	6

7 #include "build/build_config.h"	7 #include "build/build_config.h"

8	8

9 #include <sys/stat.h>	9 #include <sys/stat.h>

10 #if defined(OS_POSIX)	10 #if defined(OS_POSIX)

(...skipping 20 matching lines...) Expand all Loading...
31 #include "base/file_util.h"	31 #include "base/file_util.h"

32 #include "base/logging.h"	32 #include "base/logging.h"

33 #include "base/perftimer.h"	33 #include "base/perftimer.h"

34 #include "base/scoped_ptr.h"	34 #include "base/scoped_ptr.h"

35 #include "base/string_number_conversions.h"	35 #include "base/string_number_conversions.h"

36 #include "base/string_util.h"	36 #include "base/string_util.h"

37 #include "base/stl_util-inl.h"	37 #include "base/stl_util-inl.h"

38 #include "base/time.h"	38 #include "base/time.h"

39 #include "chrome/browser/sync/engine/syncer.h"	39 #include "chrome/browser/sync/engine/syncer.h"

40 #include "chrome/browser/sync/engine/syncer_util.h"	40 #include "chrome/browser/sync/engine/syncer_util.h"

41 #include "chrome/browser/sync/protocol/autofill_specifics.pb.h"

42 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"

43 #include "chrome/browser/sync/protocol/password_specifics.pb.h"

44 #include "chrome/browser/sync/protocol/preference_specifics.pb.h"

45 #include "chrome/browser/sync/protocol/service_constants.h"	41 #include "chrome/browser/sync/protocol/service_constants.h"

46 #include "chrome/browser/sync/protocol/theme_specifics.pb.h"	42 #include "chrome/browser/sync/protocol/theme_specifics.pb.h"

47 #include "chrome/browser/sync/protocol/typed_url_specifics.pb.h"	43 #include "chrome/browser/sync/protocol/typed_url_specifics.pb.h"

48 #include "chrome/browser/sync/syncable/directory_backing_store.h"	44 #include "chrome/browser/sync/syncable/directory_backing_store.h"

49 #include "chrome/browser/sync/syncable/directory_manager.h"	45 #include "chrome/browser/sync/syncable/directory_manager.h"

50 #include "chrome/browser/sync/syncable/syncable-inl.h"	46 #include "chrome/browser/sync/syncable/syncable-inl.h"

51 #include "chrome/browser/sync/syncable/syncable_changes_version.h"	47 #include "chrome/browser/sync/syncable/syncable_changes_version.h"

52 #include "chrome/browser/sync/syncable/syncable_columns.h"	48 #include "chrome/browser/sync/syncable/syncable_columns.h"

53 #include "chrome/browser/sync/util/crypto_helpers.h"	49 #include "chrome/browser/sync/util/crypto_helpers.h"

54 #include "chrome/common/deprecated/event_sys-inl.h"	50 #include "chrome/common/deprecated/event_sys-inl.h"

(...skipping 1652 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1707 }	1703 }

1708	1704

1709 std::ostream& operator<<(std::ostream& s, const Blob& blob) {	1705 std::ostream& operator<<(std::ostream& s, const Blob& blob) {

1710 for (Blob::const_iterator i = blob.begin(); i != blob.end(); ++i)	1706 for (Blob::const_iterator i = blob.begin(); i != blob.end(); ++i)

1711 s << std::hex << std::setw(2)	1707 s << std::hex << std::setw(2)

1712 << std::setfill('0') << static_cast<unsigned int>(*i);	1708 << std::setfill('0') << static_cast<unsigned int>(*i);

1713 return s << std::dec;	1709 return s << std::dec;

1714 }	1710 }

1715	1711

1716 } // namespace syncable	1712 } // namespace syncable

OLD	NEW