Implement policy for kNetworkPredictionOptions.

chrome/browser/policy/network_prediction_policy_handler.cc

Index: chrome/browser/policy/network_prediction_policy_handler.cc
diff --git a/chrome/browser/policy/network_prediction_policy_handler.cc b/chrome/browser/policy/network_prediction_policy_handler.cc
new file mode 100644
index 0000000000000000000000000000000000000000..0c697e772756707725520b504ba370fd0938ec81
--- /dev/null
+++ b/chrome/browser/policy/network_prediction_policy_handler.cc
@@ -0,0 +1,90 @@
+// Copyright 2014 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/network_prediction_policy_handler.h"
+
+#include "base/prefs/pref_value_map.h"
+#include "base/values.h"
+#include "chrome/browser/net/prediction_options.h"
+#include "chrome/common/pref_names.h"
+#include "components/policy/core/browser/policy_error_map.h"
+#include "components/policy/core/common/policy_map.h"
+#include "grit/components_strings.h"
+#include "policy/policy_constants.h"
+
+namespace policy {
+
+NetworkPredictionPolicyHandler::NetworkPredictionPolicyHandler() {
+}
+
+NetworkPredictionPolicyHandler::~NetworkPredictionPolicyHandler() {
+}
+
+bool NetworkPredictionPolicyHandler::CheckPolicySettings(
+    const PolicyMap& policies,
+    PolicyErrorMap* errors) {
+  // Deprecated boolean preference.
+  const base::Value* network_prediction_enabled =
+      policies.GetValue(key::kDnsPrefetchingEnabled);
+  // New enumerated preference.
+  const base::Value* network_prediction_options =
+      policies.GetValue(key::kNetworkPredictionOptions);
+
+  if (network_prediction_enabled &&
+      !network_prediction_enabled->IsType(base::Value::TYPE_BOOLEAN)) {
+    errors->AddError(key::kDnsPrefetchingEnabled,
+                     IDS_POLICY_TYPE_ERROR,
+                     ValueTypeToString(base::Value::TYPE_BOOLEAN));
+  }
+
+  if (network_prediction_options &&
+      !network_prediction_options->IsType(base::Value::TYPE_INTEGER)) {
+    errors->AddError(key::kNetworkPredictionOptions,
+                     IDS_POLICY_TYPE_ERROR,
+                     ValueTypeToString(base::Value::TYPE_INTEGER));
+  }
+
+  if (network_prediction_enabled && network_prediction_options) {
+    errors->AddError(key::kDnsPrefetchingEnabled,
+                     IDS_POLICY_OVERRIDDEN,
+                     key::kNetworkPredictionOptions);
+  }
+
+  return true;
+}
+
+void NetworkPredictionPolicyHandler::ApplyPolicySettings(
+    const PolicyMap& policies,
+    PrefValueMap* prefs) {
+  // If new preference is managed by policy, apply it to both preferences.
+  const base::Value* network_prediction_options =
+      policies.GetValue(key::kNetworkPredictionOptions);
+  int intSetting;

[Joao da Silva, 2014/07/30 13:33:32]

Other variables in this file use underscores, so rename this to int_setting for
consistency

[Bence, 2014/07/31 20:41:12]

Done.

+  if (network_prediction_options &&
+      network_prediction_options->GetAsInteger(&intSetting)) {
+    prefs->SetInteger(prefs::kNetworkPredictionOptions, intSetting);
+    // Be conservative here and only set Enabled if policy says ALWAYS.
+    prefs->SetBoolean(
+        prefs::kNetworkPredictionEnabled,
+        intSetting == chrome_browser_net::NETWORK_PREDICTION_ALWAYS);
+    return;
+  }
+
+  // If deprecated preference is managed by policy, apply it to both
+  // preferences.
+  const base::Value* network_prediction_enabled =
+      policies.GetValue(key::kDnsPrefetchingEnabled);
+  bool boolSetting;

[Joao da Silva, 2014/07/30 13:33:32]

bool_setting

[Bence, 2014/07/31 20:41:12]

Done.

+  if (network_prediction_enabled &&
+      network_prediction_enabled->GetAsBoolean(&boolSetting)) {
+    prefs->SetBoolean(prefs::kNetworkPredictionEnabled, boolSetting);
+    // Be conservative here and set Options to WIFI_ONLY.

[Joao da Silva, 2014/07/30 13:33:32]

Thanks for explaining the rationale for this. Can you expand this comment to
include that, so that future reviewers of this file also understand that
decision?

[Bence, 2014/07/31 20:41:12]

Done.

+    prefs->SetInteger(prefs::kNetworkPredictionOptions,
+                      boolSetting
+                          ? chrome_browser_net::NETWORK_PREDICTION_WIFI_ONLY
+                          : chrome_browser_net::NETWORK_PREDICTION_NEVER);
+  }
+}
+
+}  // namespace policy