Trim whitespace at DM token initialization.

Since testing special DM token values like INVALID_DM_TOKEN may require
manually setting the DM token this makes it safer, otherwise the editor
might add extra useless whitespace and mess with testing.

Change-Id: I50ceafe7fa03d39c0ea8e24f80418805f3d8639a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1913871Reviewed-by: Julian Pastarmov <pastarmovj@chromium.org>
Commit-Queue: Dominique Fauteux-Chapleau <domfc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715249}

chrome/browser/policy/browser_dm_token_storage_linux.cc

@@ -145,7 +145,7 @@ std::string BrowserDMTokenStorageLinux::InitDMToken() {
   if (!base::ReadFileToString(token_file_path, &token))
     return std::string();
 
-  return token;
+  return base::TrimWhitespaceASCII(token, base::TRIM_ALL).as_string();
 }
 
 bool BrowserDMTokenStorageLinux::InitEnrollmentErrorOption() {

chrome/browser/policy/browser_dm_token_storage_mac.mm

@@ -220,7 +220,7 @@ std::string BrowserDMTokenStorageMac::InitDMToken() {
   if (!base::ReadFileToString(token_file_path, &token))
     return std::string();
 
-  return token;
+  return base::TrimWhitespaceASCII(token, base::TRIM_ALL).as_string();
 }
 
 bool BrowserDMTokenStorageMac::InitEnrollmentErrorOption() {

chrome/browser/policy/browser_dm_token_storage_win.cc

@@ -25,6 +25,7 @@
 #include "base/logging.h"
 #include "base/no_destructor.h"
 #include "base/strings/string16.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/post_task.h"
 #include "base/task_runner_util.h"
@@ -189,7 +190,7 @@ std::string BrowserDMTokenStorageWin::InitDMToken() {
   DCHECK_LE(size, installer::kMaxDMTokenLength);
   std::string dm_token;
   dm_token.assign(raw_value.data(), size);
-  return dm_token;
+  return base::TrimWhitespaceASCII(dm_token, base::TRIM_ALL).as_string();
 }
 
 bool BrowserDMTokenStorageWin::InitEnrollmentErrorOption() {