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

chrome/browser/chromeos/chrome_browser_main_chromeos.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/chromeos/chrome_browser_main_chromeos.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 365 matching lines @@
       !parsed_command_line().HasSwitch(switches::kLoginPassword)) {
     std::string username =
         parsed_command_line().GetSwitchValueASCII(switches::kLoginUser);
     VLOG(1) << "Relaunching browser for user: " << username;
     chromeos::UserManager::Get()->UserLoggedIn(username, true);
 
     // Redirects Chrome logging to the user data dir.
     logging::RedirectChromeLogging(parsed_command_line());
 
     // 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();
+    // initialization code sees policy settings. Skip this for guest logins.

[Mattias Nissler (ping if slow), 2012/08/23 11:37:51]

nit: This comment adjustment doesn't make sense, I can see that we're doing that
from looking at the code. You might want to mention that guest accounts are not
subject to user policy though :)

[Joao da Silva, 2012/08/23 12:59:12]

Done.

+    if (!chromeos::UserManager::Get()->IsLoggedInAsGuest()) {
+      g_browser_process->browser_policy_connector()->InitializeUserPolicy(
+          username, false  /* wait_for_policy_fetch */);
+      chromeos::UserManager::Get()->SessionStarted();
+    }
   }
 
   // In Aura builds this will initialize ash::Shell.
   ChromeBrowserMainPartsLinux::PreProfileInit();
 }
 
 void ChromeBrowserMainPartsChromeos::PostProfileInit() {
   // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
   // -- just after CreateProfile().
 
   if (parsed_command_line().HasSwitch(switches::kLoginUser) &&
       !parsed_command_line().HasSwitch(switches::kLoginPassword)) {
     // Pass the TokenService pointer to the policy connector so user policy can
     // grab a token and register with the policy server.
     // TODO(mnissler): Remove once OAuth is the only authentication mechanism.
     g_browser_process->browser_policy_connector()->SetUserPolicyTokenService(
         TokenServiceFactory::GetForProfile(profile()));
 
     // Make sure we flip every profile to not share proxies if the user hasn't
     // specified so explicitly.
     const PrefService::Preference* use_shared_proxies_pref =
         profile()->GetPrefs()->FindPreference(prefs::kUseSharedProxies);
     if (use_shared_proxies_pref->IsDefaultValue())
       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.
   // Individual tests may enable them if they want.
   if (parsed_command_line().HasSwitch(switches::kTestType))
     chromeos::WizardController::SetZeroDelays();
 
   // Tests should be able to tune login manager before showing it.
   // Thus only show login manager in normal (non-testing) mode.
   if (!parameters().ui_task)
@@ skipping 156 matching lines @@
       LOG(WARNING) << "low_mem: Part of '100MB' experiment";
       chromeos::LowMemoryObserver::SetLowMemoryMargin(100);
     } else if (trial->group() == margin_200mb) {
       LOG(WARNING) << "low_mem: Part of '200MB' experiment";
       chromeos::LowMemoryObserver::SetLowMemoryMargin(200);
     } else {
       LOG(WARNING) << "low_mem: Part of 'default' experiment";
     }
   }
 }