Move pref backing up flags from local state to device settings on ChromeOS.

chrome/browser/policy/device_policy_decoder_chromeos.cc

Index: chrome/browser/policy/device_policy_decoder_chromeos.cc
diff --git a/chrome/browser/policy/device_policy_decoder_chromeos.cc b/chrome/browser/policy/device_policy_decoder_chromeos.cc
index c6430c87039176c9c92eaf16ee5a106b23ea0b43..ed975fdace0332a0eba513ed8b70742379357442 100644
--- a/chrome/browser/policy/device_policy_decoder_chromeos.cc
+++ b/chrome/browser/policy/device_policy_decoder_chromeos.cc
@@ -425,6 +425,23 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy,
                         container.allow_redeem_offers()));
     }
   }
+
+  if (policy.has_start_up_flags()) {
+    const em::StartUpFlagsProto& container(policy.start_up_flags());
+    if (container.flags_size()) {
+      ListValue* flags = new ListValue();
+      RepeatedPtrField<std::string>::const_iterator entry;
+      for (entry = container.flags().begin();
+           entry != container.flags().end();
+           ++entry) {
+        flags->Append(Value::CreateStringValue(*entry));
+      }
+      policies->Set(key::kDeviceStartUpFlags,
+                    POLICY_LEVEL_MANDATORY,
+                    POLICY_SCOPE_MACHINE,
+                    flags);
+    }
+  }
 }
 
 }  // namespace