cros: Remove OS_CHROMEOS ifdefs in ash/common

ash/common/shutdown_controller.cc

Index: ash/common/shutdown_controller.cc
diff --git a/ash/common/shutdown_controller.cc b/ash/common/shutdown_controller.cc
index 7342eb2cc43810226512d35becb9ed05550ae8f6..80b55463c16c4a23391695ca364af2c0071dce4c 100644
--- a/ash/common/shutdown_controller.cc
+++ b/ash/common/shutdown_controller.cc
@@ -6,12 +6,9 @@
 
 #include "ash/common/shell_delegate.h"
 #include "ash/common/wm_shell.h"
-
-#if defined(OS_CHROMEOS)
 #include "base/sys_info.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
-#endif
 
 namespace ash {
 
@@ -20,7 +17,6 @@ ShutdownController::ShutdownController() {}
 ShutdownController::~ShutdownController() {}
 
 void ShutdownController::ShutDownOrReboot() {
-#if defined(OS_CHROMEOS)
   if (base::SysInfo::IsRunningOnChromeOS()) {

[msw, 2017/01/06 18:22:51]

Weird, what is this? (It's not very well documented...) If it's just a way of
checking that it's not a desktop linux dev build of chrome os, can you modify
the comment below to explicitly mention dev builds or similar? (optionally
invert the check to move the comment up top)

[James Cook, 2017/01/06 20:33:05]

It's how we check if we're running on real chromeos hardware. Inverted the logic
and updated the comments.

     // Power manager handles shutdown on Chrome OS hardware.
     using chromeos::DBusThreadManager;
@@ -30,9 +26,8 @@ void ShutdownController::ShutDownOrReboot() {
       DBusThreadManager::Get()->GetPowerManagerClient()->RequestShutdown();
     return;
   }
-#endif  // defined(OS_CHROMEOS)
 
-  // On Windows and on Linux desktop just exit.
+  // On Linux desktop just exit.
   WmShell::Get()->delegate()->Exit();
 }