Remove flag cloud-policy-invalidation-delay.

chrome/browser/policy/cloud/cloud_policy_invalidator.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/policy/cloud/cloud_policy_invalidator.h"
 
 #include "base/bind.h"
-#include "base/command_line.h"
 #include "base/hash.h"
 #include "base/location.h"
 #include "base/metrics/histogram.h"
 #include "base/rand_util.h"
 #include "base/sequenced_task_runner.h"
-#include "base/strings/string_number_conversions.h"
 #include "base/time/clock.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "components/invalidation/invalidation_service.h"
 #include "components/policy/core/common/cloud/cloud_policy_client.h"
 #include "components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h"
 #include "components/policy/core/common/cloud/enterprise_metrics.h"
-#include "components/policy/core/common/policy_switches.h"
 #include "policy/policy_constants.h"
 #include "sync/notifier/object_id_invalidation_map.h"
 
 namespace policy {
 
 const int CloudPolicyInvalidator::kMissingPayloadDelay = 5;
-const int CloudPolicyInvalidator::kMaxFetchDelayDefault = 120000;
+const int CloudPolicyInvalidator::kMaxFetchDelayDefault = 10000;
 const int CloudPolicyInvalidator::kMaxFetchDelayMin = 1000;
 const int CloudPolicyInvalidator::kMaxFetchDelayMax = 300000;
 const int CloudPolicyInvalidator::kInvalidationGracePeriod = 10;
 const int CloudPolicyInvalidator::kUnknownVersionIgnorePeriod = 30;
 const int CloudPolicyInvalidator::kMaxInvalidationTimeDelta = 300;
 
 CloudPolicyInvalidator::CloudPolicyInvalidator(
     CloudPolicyCore* core,
     const scoped_refptr<base::SequencedTaskRunner>& task_runner,
     scoped_ptr<base::Clock> clock)
@@ skipping 249 matching lines @@
   int delay;
 
   // Try reading the delay from the policy.
   const base::Value* delay_policy_value =
       policy_map.GetValue(key::kMaxInvalidationFetchDelay);
   if (delay_policy_value && delay_policy_value->GetAsInteger(&delay)) {
     set_max_fetch_delay(delay);
     return;
   }
 
-  // Try reading the delay from the command line switch.
-  std::string delay_string =
-      CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-          switches::kCloudPolicyInvalidationDelay);
-  if (base::StringToInt(delay_string, &delay)) {
-    set_max_fetch_delay(delay);
-    return;
-  }
-
   set_max_fetch_delay(kMaxFetchDelayDefault);
 }
 
 void CloudPolicyInvalidator::set_max_fetch_delay(int delay) {
   if (delay < kMaxFetchDelayMin)
     max_fetch_delay_ = kMaxFetchDelayMin;
   else if (delay > kMaxFetchDelayMax)
     max_fetch_delay_ = kMaxFetchDelayMax;
   else
     max_fetch_delay_ = delay;
@@ skipping 90 matching lines @@
 bool CloudPolicyInvalidator::GetInvalidationsEnabled() {
   if (!invalidations_enabled_)
     return false;
   // If invalidations have been enabled for less than the grace period, then
   // consider invalidations to be disabled for metrics reporting.
   base::TimeDelta elapsed = clock_->Now() - invalidations_enabled_time_;
   return elapsed.InSeconds() >= kInvalidationGracePeriod;
 }
 
 }  // namespace policy