Use uint16 for port numbers, extensions/ edition

extensions/common/permissions/socket_permission_entry.cc

 // Copyright 2014 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 "extensions/common/permissions/socket_permission_entry.h"
 
 #include <cstdlib>
 #include <sstream>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "extensions/common/permissions/api_permission.h"
 #include "extensions/common/permissions/socket_permission.h"
 #include "url/url_canon.h"
 
 namespace {
 
 using content::SocketPermissionRequest;
 
 const char kColon = ':';
 const char kDot = '.';
 const char kWildcard[] = "*";
-const int kWildcardPortNumber = 0;
-const int kInvalidPort = -1;
+const uint16 kWildcardPortNumber = 0;
+const uint16 kInvalidPort = 65535;
 
 bool StartsOrEndsWithWhitespace(const std::string& str) {
   return !str.empty() &&
       (IsWhitespace(str[0]) || IsWhitespace(str[str.length() - 1]));
 }
 
 }  // namespace
 
 namespace extensions {
 
@@ skipping 144 matching lines @@
 
   if (pattern_tokens.size() == 1 || pattern_tokens[1].empty() ||
       pattern_tokens[1] == kWildcard) {
     *entry = result;
     return true;
   }
 
   if (StartsOrEndsWithWhitespace(pattern_tokens[1]))
     return false;
 
-  if (!base::StringToInt(pattern_tokens[1], &result.pattern_.port) ||
-      result.pattern_.port < 1 || result.pattern_.port > 65535)
+  int port;
+  if (!base::StringToInt(pattern_tokens[1], &port) || port < 1 || port > 65535)
     return false;
+  result.pattern_.port = static_cast<uint16>(port);
 
   *entry = result;
   return true;
 }
 
 std::string SocketPermissionEntry::GetHostPatternAsString() const {
   std::string result;
 
   if (!IsAddressBoundType())
     return result;
 
   if (match_subdomains()) {
     result.append(kWildcard);
     if (!pattern_.host.empty())
       result.append(1, kDot).append(pattern_.host);
   } else {
     result.append(pattern_.host);
   }
 
   if (pattern_.port == kWildcardPortNumber)
     result.append(1, kColon).append(kWildcard);
   else
     result.append(1, kColon).append(base::IntToString(pattern_.port));
 
   return result;
 }
 
 }  // namespace extensions