Disable easter egg on enterprised enrolled devices

chrome/browser/browser_process_platform_part_chromeos.cc

Index: chrome/browser/browser_process_platform_part_chromeos.cc
diff --git a/chrome/browser/browser_process_platform_part_chromeos.cc b/chrome/browser/browser_process_platform_part_chromeos.cc
index 520ba39318fb3ac0a359fef52c7e6e3fb0b614ed..a8ab55259a13c91782b0c20643e6982e1bd79f9b 100644
--- a/chrome/browser/browser_process_platform_part_chromeos.cc
+++ b/chrome/browser/browser_process_platform_part_chromeos.cc
@@ -21,6 +21,7 @@
 #include "chrome/browser/chromeos/system/device_disabling_manager_default_delegate.h"
 #include "chrome/browser/chromeos/system/timezone_util.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/common/chrome_switches.h"
 #include "chromeos/geolocation/simple_geolocation_provider.h"
 #include "chromeos/timezone/timezone_resolver.h"
 #include "components/session_manager/core/session_manager.h"
@@ -45,6 +46,7 @@ void BrowserProcessPlatformPart::ShutdownAutomaticRebootManager() {
 }
 
 void BrowserProcessPlatformPart::InitializeChromeUserManager() {
+  DisableDinoEasterEgg();
   DCHECK(!chrome_user_manager_);
   chrome_user_manager_ =
       chromeos::ChromeUserManagerImpl::CreateChromeUserManager();
@@ -76,6 +78,7 @@ void BrowserProcessPlatformPart::InitializeSessionManager(
     const base::CommandLine& parsed_command_line,
     Profile* profile,
     bool is_running_test) {
+

[sky, 2015/03/23 15:59:20]

remove this line.

[edwardjung, 2015/03/24 16:07:35]

Done.

   DCHECK(!session_manager_);
   session_manager_ = chromeos::ChromeSessionManager::CreateSessionManager(
       parsed_command_line, profile, is_running_test);
@@ -111,6 +114,15 @@ BrowserProcessPlatformPart::browser_policy_connector_chromeos() {
       g_browser_process->browser_policy_connector());
 }
 
+void BrowserProcessPlatformPart::DisableDinoEasterEgg() {
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+  const bool is_enterprise_managed = g_browser_process->platform_part()->
+             browser_policy_connector_chromeos()->IsEnterpriseManaged();
+  if (is_enterprise_managed) {

[sky, 2015/03/23 15:59:20]

nit: no {}

[edwardjung, 2015/03/24 16:07:35]

Done.

+    command_line->AppendSwitch(switches::kDisableDinosaurEasterEgg);
+  }
+}
+
 chromeos::TimeZoneResolver* BrowserProcessPlatformPart::GetTimezoneResolver() {
   if (!timezone_resolver_.get()) {
     timezone_resolver_.reset(new chromeos::TimeZoneResolver(