Remove the --enable-device-policy and --enable-onc-policy flags.

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index e477bae06cb315cb4683ddb462083c28cf1024d6..0b52b59035803cf8a73f301ea8516383a7ba88eb 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -384,9 +384,12 @@ void ChromeBrowserMainPartsChromeos::PreProfileInit() {
 
     // Initialize user policy before creating the profile so the profile
     // initialization code sees policy settings.
-    g_browser_process->browser_policy_connector()->InitializeUserPolicy(
-        username, false  /* wait_for_policy_fetch */);
-    chromeos::UserManager::Get()->SessionStarted();
+    // Guest accounts are not subject to user policy.
+    if (!chromeos::UserManager::Get()->IsLoggedInAsGuest()) {
+      g_browser_process->browser_policy_connector()->InitializeUserPolicy(
+          username, false  /* wait_for_policy_fetch */);
+      chromeos::UserManager::Get()->SessionStarted();

[Dmitry Polukhin, 2012/08/30 08:48:53]

Putting SessionStarted into !IsLoggedInAsGuest broke guest mode on Chrome OS,
see  http://code.google.com/p/chromium/issues/detail?id=145116

+    }
   }
 
   // In Aura builds this will initialize ash::Shell.
@@ -413,12 +416,10 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() {
       profile()->GetPrefs()->SetBoolean(prefs::kUseSharedProxies, false);
   }
 
-  if (parsed_command_line().HasSwitch(switches::kEnableONCPolicy)) {
-    network_config_updater_.reset(
-        new policy::NetworkConfigurationUpdater(
-            g_browser_process->policy_service(),
-            chromeos::CrosLibrary::Get()->GetNetworkLibrary()));
-  }
+  network_config_updater_.reset(
+      new policy::NetworkConfigurationUpdater(
+          g_browser_process->policy_service(),
+          chromeos::CrosLibrary::Get()->GetNetworkLibrary()));
 
   // Make sure that wallpaper boot transition and other delays in OOBE
   // are disabled for tests by default.