diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-31 19:44:25 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-31 19:44:25 +0000 |
| commit | 310512cc361ab20d11a236095664fafae2250fac (patch) | |
| tree | ce779afc56fb845f043ea7f54e905c7ff4d8d697 /sync/util/get_session_name.cc | |
| parent | 126f1d652abfd11204fb7b4aed48dcb9999903d9 (diff) | |
| download | chromium_src-310512cc361ab20d11a236095664fafae2250fac.zip chromium_src-310512cc361ab20d11a236095664fafae2250fac.tar.gz chromium_src-310512cc361ab20d11a236095664fafae2250fac.tar.bz2 | |
[Sync] Add support for performing a GetKey on startup.
The functionality is behind the --sync-keystore-encryption flag, and the key
is not currently consumed by anything, but this lays the groundwork for testing
the server and client interaction.
We request a key anytime we perform a GetUpdates while the cryptographer
does not have a keystore key. But, it is considered an error to request a key
and not receive one, putting us into a state of backoff.
BUG=129665
TEST=sync_unit_tests, running against python server
Review URL: https://chromiumcodereview.appspot.com/10455012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149248 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/util/get_session_name.cc')
| -rw-r--r-- | sync/util/get_session_name.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sync/util/get_session_name.cc b/sync/util/get_session_name.cc index 99a4ce0..8c86c5c 100644 --- a/sync/util/get_session_name.cc +++ b/sync/util/get_session_name.cc @@ -43,7 +43,7 @@ std::string GetSessionNameSynchronously() { #elif defined(OS_LINUX) session_name = base::GetLinuxDistro(); #elif defined(OS_MACOSX) - session_name = internal::GetHardwareModelName(); +// session_name = internal::GetHardwareModelName(); #elif defined(OS_WIN) session_name = internal::GetComputerName(); #elif defined(OS_ANDROID) |