Trim the lsb_release output in GetLinuxDistro.

base/linux_util.cc

 // Copyright (c) 2009 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 "base/linux_util.h"
 
 #include <stdlib.h>
 
 #include <vector>
 
@@ skipping 125 matching lines @@
     // little reason to believe it will work if we attempt to run
     // lsb_release again.
     std::vector<std::string> argv;
     argv.push_back("lsb_release");
     argv.push_back("-d");
     std::string output;
     base::GetAppOutput(CommandLine(argv), &output);
     if (output.length() > 0) {
       // lsb_release -d should return: Description:<tab>Distro Info
       static const std::string field = "Description:\t";
-      if (output.compare(0, field.length(), field) == 0)
+      if (output.compare(0, field.length(), field) == 0) {
         linux_distro = output.substr(field.length());
+        TrimWhitespaceASCII(linux_distro, TRIM_ALL, &linux_distro);
+      }
     }
     distro_state_singleton->CheckFinished();
     return linux_distro;
   } else if (STATE_CHECK_STARTED == state) {
     // If the distro check above is in progress in some other thread, we're
     // not going to wait for the results.
     return "Unknown";
   } else {
     // In STATE_CHECK_FINISHED, no more writing to |linux_distro|.
     return linux_distro;
@@ skipping 43 matching lines @@
       return "KDE4";
   }
   return NULL;
 }
 
 const char* GetDesktopEnvironmentName(EnvironmentVariableGetter* env) {
   return GetDesktopEnvironmentName(GetDesktopEnvironment(env));
 }
 
 }  // namespace base