Relanding this as this did not fix the chromiumos breakage.

chrome/common/chrome_switches.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/common/chrome_switches.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 
 namespace switches {
@@ skipping 803 matching lines @@
 // Enable Kiosk mode.
 const char kKioskMode[]                     = "kiosk";
 
 // Print automatically in kiosk mode. |kKioskMode| must be set as well.
 // See http://crbug.com/31395.
 const char kKioskModePrinting[]             = "kiosk-printing";
 
 // 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";
 
 // Loads the opencryptoki library into NSS at startup. This is only needed
 // temporarily for developers who need to work on WiFi/VPN certificate code.
 //
 // TODO(gspencer): Remove this switch once cryptohomed work is finished:
 // http://crosbug.com/12295 and http://crosbug.com/12304
 const char kLoadOpencryptoki[]              = "load-opencryptoki";
 
@@ skipping 715 matching lines @@
 
 // -----------------------------------------------------------------------------
 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
 //
 // You were going to just dump your switches here, weren't you? Instead, please
 // put them in alphabetical order above, or in order inside the appropriate
 // ifdef at the bottom. The order should match the header.
 // -----------------------------------------------------------------------------
 
 }  // namespace switches