Enterprise policy to prevent queries to the Quirks Server

chrome/browser/chromeos/settings/device_settings_provider.cc

Index: chrome/browser/chromeos/settings/device_settings_provider.cc
diff --git a/chrome/browser/chromeos/settings/device_settings_provider.cc b/chrome/browser/chromeos/settings/device_settings_provider.cc
index cb2c5fcaac7ba9e3f3f66f60f48e9012a06ac99e..0e165000f7a4f2630b0a2f662076b6be9b02f596 100644
--- a/chrome/browser/chromeos/settings/device_settings_provider.cc
+++ b/chrome/browser/chromeos/settings/device_settings_provider.cc
@@ -63,6 +63,7 @@ const char* const kKnownSettings[] = {
     kDeviceDisabled,
     kDeviceDisabledMessage,
     kDeviceOwner,
+    kDeviceQuirksDownloadEnabled,
     kDisplayRotationDefault,
     kExtensionCacheSize,
     kHeartbeatEnabled,
@@ -444,6 +445,14 @@ void DecodeGenericPolicies(
         kDisplayRotationDefault,
         policy.display_rotation_default().display_rotation_default());
   }
+
+  if (policy.has_quirks_download_enabled()) {
+    if (policy.quirks_download_enabled().has_quirks_download_enabled()) {
+      new_values_cache->SetBoolean(

[Greg Levin, 2016/03/14 17:29:47]

As in device_policy_decoder_chromeos.cc, is the second "if" needed?  Some blocks
put both conditions in "if (X  && Y)", others do "if (X) if (Y)", and some just
have "if (X)".  Which is right in my case?

[Thiemo Nagel, 2016/03/23 14:53:24]

Again, I'd say yes, use both conditions.  The "if (X && Y)" formulation seems to
be the most readable to me.

[Greg Levin, 2016/03/24 23:21:39]

Done.

+          kDeviceQuirksDownloadEnabled,
+          policy.quirks_download_enabled().quirks_download_enabled());
+    }
+  }
 }
 
 void DecodeLogUploadPolicies(const em::ChromeDeviceSettingsProto& policy,