Switch to standard integer types in mojo/.

mojo/services/network/network_context.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 "mojo/services/network/network_context.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 #include <utility>
 #include <vector>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "mojo/common/user_agent.h"
 #include "mojo/services/network/mojo_persistent_cookie_store.h"
 #include "mojo/services/network/url_loader_impl.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/dns/host_resolver.h"
 #include "net/dns/mapped_host_resolver.h"
 #include "net/log/net_log_util.h"
 #include "net/log/write_to_file_net_log_observer.h"
@@ skipping 12 matching lines @@
 // Ignores certificate-related errors.
 const char kIgnoreCertificateErrors[] = "ignore-certificate-errors";
 
 // Logs network information to the specified file.
 const char kLogNetLog[] = "log-net-log";
 
 // Allows for forcing socket connections to HTTP/HTTPS to use fixed ports.
 const char kTestingFixedHttpPort[] = "testing-fixed-http-port";
 const char kTestingFixedHttpsPort[] = "testing-fixed-https-port";
 
-uint16 GetPortNumber(const base::CommandLine& command_line,
-                     const base::StringPiece& switch_name) {
+uint16_t GetPortNumber(const base::CommandLine& command_line,
+                       const base::StringPiece& switch_name) {
   std::string port_str = command_line.GetSwitchValueASCII(switch_name);
   unsigned port;
   if (!base::StringToUint(port_str, &port) || port > 65535) {
     LOG(ERROR) << "Invalid value for switch " << switch_name << ": '"
                << port_str << "' is not a valid port number.";
     return 0;
   }
-  return static_cast<uint16>(port);
+  return static_cast<uint16_t>(port);
 }
 
 }  // namespace
 
 class NetworkContext::MojoNetLog : public net::NetLog {
  public:
   MojoNetLog() {
     const base::CommandLine* command_line =
         base::CommandLine::ForCurrentProcess();
     if (!command_line->HasSwitch(kLogNetLog))
@@ skipping 140 matching lines @@
             false,  // TODO(erg): Make RESTORED_SESSION_COOKIES configurable.
             nullptr);
     builder.SetCookieAndChannelIdStores(
         new net::CookieMonster(cookie_store, nullptr), nullptr);
   }
 
   return builder.Build();
 }
 
 }  // namespace mojo