Add a new policy to allow for release channel delegation.

chrome/browser/policy/device_policy_cache.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/policy/device_policy_cache.h"
 
 #include <limits>
 #include <string>
 #include <vector>
 
@@ skipping 388 matching lines @@
 
   if (policy.has_metrics_enabled()) {
     const em::MetricsEnabledProto& container(policy.metrics_enabled());
     if (container.has_metrics_enabled()) {
       policies->Set(key::kDeviceMetricsReportingEnabled, POLICY_LEVEL_MANDATORY,
                     POLICY_SCOPE_MACHINE,
                     Value::CreateBooleanValue(container.metrics_enabled()));
     }
   }
 
-  if (policy.has_release_channel() &&
-      policy.release_channel().has_release_channel()) {
-    std::string channel(policy.release_channel().release_channel());
-    policies->Set(key::kChromeOsReleaseChannel, POLICY_LEVEL_MANDATORY,
-                  POLICY_SCOPE_MACHINE, Value::CreateStringValue(channel));
-    // TODO(dubroy): Once http://crosbug.com/17015 is implemented, we won't
-    // have to pass the channel in here, only ping the update engine to tell
-    // it to fetch the channel from the policy.
-    chromeos::DBusThreadManager::Get()->GetUpdateEngineClient()
-        ->SetReleaseTrack(channel);
+  if (policy.has_release_channel()) {
+    const em::ReleaseChannelProto& container(policy.release_channel());
+    if (container.has_release_channel()) {
+      std::string channel(container.release_channel());
+      policies->Set(key::kChromeOsReleaseChannel, POLICY_LEVEL_MANDATORY,
+                    POLICY_SCOPE_MACHINE, Value::CreateStringValue(channel));
+      // TODO(dubroy): Once http://crosbug.com/17015 is implemented, we won't
+      // have to pass the channel in here, only ping the update engine to tell
+      // it to fetch the channel from the policy.
+      chromeos::DBusThreadManager::Get()->GetUpdateEngineClient()->
+          SetReleaseTrack(channel);
+    }
+    if (container.has_release_channel_delegated()) {
+      policies->Set(key::kDeviceMetricsReportingEnabled,

[Joao da Silva, 2012/03/12 15:12:01]

Wrong key.

[pastarmovj, 2012/03/13 15:03:29]

Done.

+                    POLICY_LEVEL_MANDATORY,
+                    POLICY_SCOPE_MACHINE,
+                    Value::CreateBooleanValue(
+                        container.release_channel_delegated()));
+    }
   }
 
   if (policy.has_open_network_configuration() &&
       policy.open_network_configuration().has_open_network_configuration()) {
     std::string config(
         policy.open_network_configuration().open_network_configuration());
     policies->Set(key::kDeviceOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY,
                   POLICY_SCOPE_MACHINE, Value::CreateStringValue(config));
   }
 
@@ skipping 23 matching lines @@
     if (container.has_ephemeral_users_enabled()) {
       policies->Set(key::kDeviceEphemeralUsersEnabled, POLICY_LEVEL_MANDATORY,
                     POLICY_SCOPE_MACHINE,
                     Value::CreateBooleanValue(
                         container.ephemeral_users_enabled()));
     }
   }
 }
 
 }  // namespace policy