Linux: enable SxS (side-by-side) support

chrome/common/chrome_version_info_posix.cc

 // Copyright (c) 2011 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 "chrome/common/chrome_version_info.h"
 
+#include "base/strings/string_util.h"
 #include "build/build_config.h"
 
 namespace chrome {
 
 // static
 std::string VersionInfo::GetVersionStringModifier() {
   char* env = getenv("CHROME_VERSION_EXTRA");
   if (!env) {
     std::string modifier;
 #if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
@@ skipping 20 matching lines @@
   modifier += " aura";
 #endif
 
   return modifier;
 }
 
 // static
 VersionInfo::Channel VersionInfo::GetChannel() {
 #if defined(GOOGLE_CHROME_BUILD)
   std::string channel = GetVersionStringModifier();
+  // There might be suffixes after channel name (e.g. "aura"), so match just
+  // the beginning of version string modifier.
   if (channel.empty()) {
     return CHANNEL_STABLE;
-  } else if (channel == "beta") {
+  } else if (StartsWithASCII(channel, "beta ", true)) {
     return CHANNEL_BETA;
-  } else if (channel == "dev") {
+  } else if (StartsWithASCII(channel, "dev ", true)) {
     return CHANNEL_DEV;
-  } else if (channel == "canary") {
+  } else if (StartsWithASCII(channel, "canary ", true)) {
     return CHANNEL_CANARY;
   }
 #endif
 
   return CHANNEL_UNKNOWN;
 }
 
 }  // namespace chrome