diff options
| author | thakis <thakis@chromium.org> | 2015-07-03 21:34:05 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-04 04:34:39 +0000 |
| commit | ac24c994fa0dae5014759cf88620c303d9397655 (patch) | |
| tree | 14f460b0b4cf96fc45d7d974c1c82cbed789294d /content/browser/background_sync | |
| parent | 336be30541e60a462aad340cbc0c21bbd58f6a31 (diff) | |
| download | chromium_src-ac24c994fa0dae5014759cf88620c303d9397655.zip chromium_src-ac24c994fa0dae5014759cf88620c303d9397655.tar.gz chromium_src-ac24c994fa0dae5014759cf88620c303d9397655.tar.bz2 | |
Revert of Try harder to work around a clang/win bug. (patchset #1 id:1 of https://codereview.chromium.org/1208103006/)
Reason for revert:
Looks like this is unnecessary; the first CL did the trick already.
Original issue's description:
> Try harder to work around a clang/win bug.
>
> This is a follow-up to https://codereview.chromium.org/1215613006
> which didn't help.
>
> BUG=BUG=488634
> TBR=jkarlin@chromium.org
TBR=jkarlin@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=BUG=488634
Review URL: https://codereview.chromium.org/1221433004
Cr-Commit-Position: refs/heads/master@{#337338}
Diffstat (limited to 'content/browser/background_sync')
| -rw-r--r-- | content/browser/background_sync/background_sync_registration_options.cc | 7 | ||||
| -rw-r--r-- | content/browser/background_sync/background_sync_registration_options.h | 8 |
2 files changed, 6 insertions, 9 deletions
diff --git a/content/browser/background_sync/background_sync_registration_options.cc b/content/browser/background_sync/background_sync_registration_options.cc index 4c00ad1..dc3d2e1 100644 --- a/content/browser/background_sync/background_sync_registration_options.cc +++ b/content/browser/background_sync/background_sync_registration_options.cc @@ -7,11 +7,8 @@ namespace content { // TODO(thakis): Remove this once http://crbug.com/488634 is fixed. -BackgroundSyncRegistrationOptions::BackgroundSyncRegistrationOptions() - : min_period(0), - network_state(NETWORK_STATE_ONLINE), - power_state(POWER_STATE_AVOID_DRAINING), - periodicity(SYNC_ONE_SHOT) {} +BackgroundSyncRegistrationOptions::BackgroundSyncRegistrationOptions() = + default; bool BackgroundSyncRegistrationOptions::Equals( const BackgroundSyncRegistrationOptions& other) const { diff --git a/content/browser/background_sync/background_sync_registration_options.h b/content/browser/background_sync/background_sync_registration_options.h index 1092f3e..9dcb8d9 100644 --- a/content/browser/background_sync/background_sync_registration_options.h +++ b/content/browser/background_sync/background_sync_registration_options.h @@ -19,10 +19,10 @@ struct CONTENT_EXPORT BackgroundSyncRegistrationOptions { bool Equals(const BackgroundSyncRegistrationOptions& other) const; std::string tag; - int64_t min_period; - SyncNetworkState network_state; - SyncPowerState power_state; - SyncPeriodicity periodicity; + int64_t min_period = 0; + SyncNetworkState network_state = NETWORK_STATE_ONLINE; + SyncPowerState power_state = POWER_STATE_AVOID_DRAINING; + SyncPeriodicity periodicity = SYNC_ONE_SHOT; }; } // namespace content |