update_engine: UM: Move static member initialization to .cc file.
Using default initializers for these members in header files results in
multiple instantiations in different translation units and leads to link
errors when compiled (for example) with clang.
BUG=None
TEST=Builds fine w/ clang, passes unit tests.
Change-Id: I60926b7dde0a663736294b3252114979b4e56c66
Reviewed-on: https://chromium-review.googlesource.com/219811
Reviewed-by: Gilad Arnold <garnold@chromium.org>
Commit-Queue: Gilad Arnold <garnold@chromium.org>
Tested-by: Gilad Arnold <garnold@chromium.org>
diff --git a/update_manager/chromeos_policy.cc b/update_manager/chromeos_policy.cc
index 67799ce..fc39bd7 100644
--- a/update_manager/chromeos_policy.cc
+++ b/update_manager/chromeos_policy.cc
@@ -150,6 +150,11 @@
namespace chromeos_update_manager {
+const int ChromeOSPolicy::kTimeoutInitialInterval = 7 * 60;
+const int ChromeOSPolicy::kTimeoutPeriodicInterval = 45 * 60;
+const int ChromeOSPolicy::kTimeoutMaxBackoffInterval = 4 * 60 * 60;
+const int ChromeOSPolicy::kTimeoutRegularFuzz = 10 * 60;
+
EvalStatus ChromeOSPolicy::UpdateCheckAllowed(
EvaluationContext* ec, State* state, string* error,
UpdateCheckParams* result) const {
diff --git a/update_manager/chromeos_policy.h b/update_manager/chromeos_policy.h
index 7c23612..846bf57 100644
--- a/update_manager/chromeos_policy.h
+++ b/update_manager/chromeos_policy.h
@@ -85,11 +85,10 @@
// Default update check timeout interval/fuzz values used to compute the
// NextUpdateCheckTime(), in seconds. Actual fuzz is within +/- half of the
// indicated value.
- static const int kTimeoutInitialInterval = 7 * 60;
- static const int kTimeoutPeriodicInterval = 45 * 60;
- static const int kTimeoutQuickInterval = 1 * 60;
- static const int kTimeoutMaxBackoffInterval = 4 * 60 * 60;
- static const int kTimeoutRegularFuzz = 10 * 60;
+ static const int kTimeoutInitialInterval;
+ static const int kTimeoutPeriodicInterval;
+ static const int kTimeoutMaxBackoffInterval;
+ static const int kTimeoutRegularFuzz;
// A private policy implementation returning the wallclock timestamp when
// the next update check should happen.