diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-15 06:18:36 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-15 06:18:36 +0000 |
| commit | f706df5706936983f97b4898997da87029787da2 (patch) | |
| tree | a1315c180059844bf0bc6344452f18544da6c91f /sync/sessions | |
| parent | 639ec914f10c955f3b0c0c7dc2b1cdfd6b9f9527 (diff) | |
| download | chromium_src-f706df5706936983f97b4898997da87029787da2.zip chromium_src-f706df5706936983f97b4898997da87029787da2.tar.gz chromium_src-f706df5706936983f97b4898997da87029787da2.tar.bz2 | |
sync: add InternalComponentsFactory::Switches to simplify passing switches to internal components.
Cleans up backoff retry override code to use InternalComponentsFactory::Switches rather than
global bool hack.
Also puts keystore encryption flag atop new mechanism.
(TBR sky for new chrome_switch).
TBR=sky@chromium.org
BUG=142029, 139839
Review URL: https://chromiumcodereview.appspot.com/10837231
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151664 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/sessions')
| -rw-r--r-- | sync/sessions/sync_session.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sync/sessions/sync_session.cc b/sync/sessions/sync_session.cc index f432978..ee29668 100644 --- a/sync/sessions/sync_session.cc +++ b/sync/sessions/sync_session.cc @@ -239,18 +239,13 @@ std::set<ModelSafeGroup> } namespace { -// Return true if the command in question was attempted and did not complete -// successfully. -bool IsError(SyncerError error) { - return error != UNSET && error != SYNCER_OK; -} // Returns false iff one of the command results had an error. bool HadErrors(const ModelNeutralState& state) { - const bool get_key_error = IsError(state.last_get_key_result); + const bool get_key_error = SyncerErrorIsError(state.last_get_key_result); const bool download_updates_error = - IsError(state.last_download_updates_result); - const bool commit_error = IsError(state.commit_result); + SyncerErrorIsError(state.last_download_updates_result); + const bool commit_error = SyncerErrorIsError(state.commit_result); return get_key_error || download_updates_error || commit_error; } } // namespace |