Enterprise policy to prevent queries to the Quirks Server

chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc

Index: chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
diff --git a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
index 2579fe748b014c7560fe8d9a68fa4891cbedb68f..60da8fc4e88f6e894fdb1abd6ac539f32d4c716b 100644
--- a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
+++ b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
@@ -822,6 +822,20 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy,
         DecodeIntegerValue(container.display_rotation_default()).release(),
         nullptr);
   }
+
+  if (policy.has_quirks_download_enabled()) {
+    const em::DeviceQuirksDownloadEnabledProto& container(
+        policy.quirks_download_enabled());
+    if (container.has_quirks_download_enabled()) {

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

Is this second "if" statement needed?  Some of the above policy blocks have two
if's, and some have one.  I didn't dig deeply enough into the auto-generated
chrome_device_policy.pb.h file to figure out what's going on in there, or if my
code here is just right.

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

It all depends on the policy proto that we receive from the server.  In the
spirit of Postel's law, I'd prefer to check the input as carefully as possible
and thus to include the if.

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

Acknowledged.

+      policies->Set(
+          key::kDeviceQuirksDownloadEnabled,
+          POLICY_LEVEL_MANDATORY,
+          POLICY_SCOPE_MACHINE,
+          POLICY_SOURCE_CLOUD,
+          new base::FundamentalValue(container.quirks_download_enabled()),
+          NULL);

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

git cl format complained about this block, requesting that it be formatted more
like the has_login_screen_domain_auto_complete() block above.  But most
policies->Set() calls have one arg per line.  I'm assuming this is preferred? 
Should I reformat the two blocks above to make them consistent?

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

I'd agree.  Consistency trumps everything.
That would be awesome. :)

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

Done.

+    }
+  }
 }
 
 }  // namespace