Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

base/version.cc

 // Copyright (c) 2012 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/version.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 13 matching lines @@
 // parsed successfully, false otherwise.
 bool ParseVersionNumbers(const std::string& version_str,
                          std::vector<uint16>* parsed) {
   std::vector<std::string> numbers;
   SplitString(version_str, '.', &numbers);
   if (numbers.empty())
     return false;
 
   for (std::vector<std::string>::const_iterator it = numbers.begin();
        it != numbers.end(); ++it) {
-    if (StartsWithASCII(*it, "+", false))
-      return false;
     int num;
     if (!StringToInt(*it, &num))
       return false;
 
     if (num < 0)
       return false;
 
     const uint16 max = 0xFFFF;
     if (num > max)
       return false;
 
-    // This throws out leading zeros for the first item only.
-    if (it == numbers.begin() && IntToString(num) != *it)
+    // This throws out things like +3, or 032.
+    if (IntToString(num) != *it)
       return false;
 
     parsed->push_back(static_cast<uint16>(num));
   }
   return true;
 }
 
 // Compares version components in |components1| with components in
 // |components2|. Returns -1, 0 or 1 if |components1| is less than, equal to,
 // or greater than |components2|, respectively.
@@ skipping 112 matching lines @@
   size_t count = components_.size();
   for (size_t i = 0; i < count - 1; ++i) {
     version_str.append(IntToString(components_[i]));
     version_str.append(".");
   }
   version_str.append(IntToString(components_[count - 1]));
   return version_str;
 }
 
 }  // namespace base