Merge 264110 "linux_aura: Remove the 'a' badge."

chrome/common/chrome_version_info_posix.cc

Index: chrome/common/chrome_version_info_posix.cc
===================================================================
--- chrome/common/chrome_version_info_posix.cc	(revision 265336)
+++ chrome/common/chrome_version_info_posix.cc	(working copy)
@@ -12,13 +12,8 @@
 // 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)
-    modifier = "aura";
-#endif
-    return modifier;
-  }
+  if (!env)
+    return std::string();
   std::string modifier(env);
 
 #if defined(GOOGLE_CHROME_BUILD)
@@ -34,10 +29,6 @@
   }
 #endif
 
-#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
-  modifier += " aura";
-#endif
-
   return modifier;
 }