Added function to provide the short board name of the device

ash/wm/lock_state_controller.cc

Index: ash/wm/lock_state_controller.cc
diff --git a/ash/wm/lock_state_controller.cc b/ash/wm/lock_state_controller.cc
index 5842f1706c5083ff5492aaf7dceb4902af91372d..cc70a8a7b008fbbb8fafb0ba1f1cee2cd33f5144 100644
--- a/ash/wm/lock_state_controller.cc
+++ b/ash/wm/lock_state_controller.cc
@@ -488,11 +488,9 @@ void LockStateController::PreLockAnimationFinished(bool request_lock) {
       base::TimeDelta::FromMilliseconds(kLockFailTimeoutMs);
 #if defined(OS_CHROMEOS)
   // Increase lock timeout for slower hardware, see http://crbug.com/350628
-  const std::string board = base::SysInfo::GetLsbReleaseBoard();
-  if (board == "x86-mario" ||
-      base::StartsWith(board, "x86-alex", base::CompareCase::SENSITIVE) ||
-      base::StartsWith(board, "x86-zgb", base::CompareCase::SENSITIVE) ||
-      base::StartsWith(board, "daisy", base::CompareCase::SENSITIVE)) {
+  const std::string board = base::SysInfo::GetStrippedReleaseBoard();
+  if (board == "x86-mario" || board == "x86-alex" || board == "x86-zgb" ||

[Nikita (slow), 2016/11/22 19:10:11]

That wouldn't work as there're some modifications of boards that *start with*
"x86-alex" / "x86-zgb"

[Thiemo Nagel, 2016/11/23 20:21:19]

Apparently there's x86-alex and x86-alex-he, and likewise for x86-zgb.

Note that for daisy, there's daisy, daisy_spring and daisy_skate which are all
different devices though, and from reading crbug.com/445226 it doesn't seem to
that it was intended to cover all of them.  Thus I'd suggest to go for an exact
match with daisy.

[igorcov, 2016/11/25 11:08:59]

Done.

+      board == "daisy") {
     timeout *= 2;
   }
 #endif