Relanding this as this did not fix the chromiumos breakage.

chrome/common/chrome_switches.cc

Index: chrome/common/chrome_switches.cc
===================================================================
--- chrome/common/chrome_switches.cc	(revision 150400)
+++ chrome/common/chrome_switches.cc	(working copy)
@@ -821,6 +821,10 @@
 // Comma-separated list of directories with component extensions to load.
 const char kLoadComponentExtension[]        = "load-component-extension";
 
+// If present, cloud policy will be loaded and applied once the user is signed
+// in to the browser.
+const char kLoadCloudPolicyOnSignin[]        = "load-cloud-policy-on-signin";
+
 // Loads an extension from the specified directory.
 const char kLoadExtension[]                 = "load-extension";
 
Property changes on: chrome\common\chrome_switches.cc
___________________________________________________________________
Added: svn:mergeinfo