cros: Remove OS_CHROMEOS ifdefs in ash/common

ash/common/shutdown_controller.cc

 // Copyright 2016 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 "ash/common/shutdown_controller.h"
 
 #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 {
 
 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;
     if (reboot_on_shutdown_)
       DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart();
     else
       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();
 }
 
 void ShutdownController::SetRebootOnShutdown(bool reboot_on_shutdown) {
   reboot_on_shutdown_ = reboot_on_shutdown;
 }
 
 void ShutdownController::BindRequest(mojom::ShutdownControllerRequest request) {
   bindings_.AddBinding(this, std::move(request));
 }
 
 }  // namespace ash