Add usb_detachable_whitelist to device policy proto

chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc

 // Copyright (c) 2012 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/chromeos/policy/device_policy_decoder_chromeos.h"
 
 #include <limits>
 #include <string>
 
 #include "base/callback.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/policy/device_local_account.h"
 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/update_engine_client.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "components/policy/core/browser/browser_policy_connector.h"
 #include "components/policy/core/common/external_data_fetcher.h"
 #include "components/policy/core/common/policy_map.h"
@@ skipping 791 matching lines @@
     const em::DisplayRotationDefaultProto& container(
         policy.display_rotation_default());
     policies->Set(
         key::kDisplayRotationDefault,
         POLICY_LEVEL_MANDATORY,
         POLICY_SCOPE_MACHINE,
         POLICY_SOURCE_CLOUD,
         DecodeIntegerValue(container.display_rotation_default()).release(),
         nullptr);
   }
+
+  if (policy.has_usb_detachable_whitelist()) {
+    const em::UsbDetachableWhitelistProto& container(
+        policy.usb_detachable_whitelist());
+    base::ListValue* whitelist = new base::ListValue();
+    RepeatedPtrField<em::UsbDeviceIdProto>::const_iterator entry;
+    for (entry = container.id().begin(); entry != container.id().end();
+         ++entry) {
+      base::ListValue* ids = new base::ListValue();
+      const std::string vid =

[bartfab (slow), 2016/03/07 11:16:47]

Sorry for the many nits: Rather than a magic value "<no VID>", the best way to
indicate whether a value is present or not is a DictionaryValue instead of a
ListValue: Use "vid"/"pid" as keys and leave out the entries if the vid/pid is
unset.

[vpalatin, 2016/03/07 16:38:28]

Done.

+          entry->has_vendor_id()
+              ? base::StringPrintf("%04X", entry->vendor_id())
+              : "<no VID>";
+      const std::string pid =
+          entry->has_product_id()
+              ? base::StringPrintf("%04X", entry->product_id())
+              : "<no PID>";
+      ids->Append(new base::StringValue(vid));
+      ids->Append(new base::StringValue(pid));
+      whitelist->Append(ids);
+    }
+    policies->Set(key::kUsbDetachableWhitelist, POLICY_LEVEL_MANDATORY,
+                  POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD, whitelist,
+                  nullptr);
+  }
 }
 
 }  // namespace
 
 void DecodeDevicePolicy(const em::ChromeDeviceSettingsProto& policy,
                         PolicyMap* policies) {
   // Decode the various groups of policies.
   DecodeLoginPolicies(policy, policies);
   DecodeNetworkPolicies(policy, policies);
   DecodeReportingPolicies(policy, policies);
   DecodeAutoUpdatePolicies(policy, policies);
   DecodeAccessibilityPolicies(policy, policies);
   DecodeGenericPolicies(policy, policies);
 }
 
 }  // namespace policy