Revert of Remove kuint16max.

net/test/spawned_test_server/spawner_communicator.h

 // 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.
 
 #ifndef NET_TEST_SPAWNED_TEST_SERVER_SPAWNER_COMMUNICATOR_H_
 #define NET_TEST_SPAWNED_TEST_SERVER_SPAWNER_COMMUNICATOR_H_
 
-#include <stdint.h>
-
 #include <string>
 
+#include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "net/url_request/url_request.h"
 
 namespace net {
 
 class ScopedPortException;
 
@@ skipping 32 matching lines @@
 // Path: "/ping".
 // Method: "GET".
 // Data to server: None.
 // Data from server: String "ready" returned if success.
 //
 // The internal I/O thread is required by net stack to perform net I/O.
 // The Start/StopServer methods block the caller thread until result is
 // fetched from spawner server or timed-out.
 class SpawnerCommunicator : public URLRequest::Delegate {
  public:
-  explicit SpawnerCommunicator(uint16_t port);
+  explicit SpawnerCommunicator(uint16 port);
   ~SpawnerCommunicator() override;
 
   // Starts an instance of the Python test server on the host/ machine.
   // If successfully started, returns true, setting |*port| to the port
   // on the local machine that can be used to communicate with the remote
   // test server.
   bool StartServer(const std::string& arguments,
-                   uint16_t* port) WARN_UNUSED_RESULT;
+                   uint16* port) WARN_UNUSED_RESULT;
 
   bool StopServer() WARN_UNUSED_RESULT;
 
  private:
   // Starts the IO thread. Called on the user thread.
   void StartIOThread();
 
   // Shuts down the remote test server spawner. Called on the user thread.
   void Shutdown();
 
@@ skipping 33 matching lines @@
   // A thread to communicate with test_spawner server.
   base::Thread io_thread_;
 
   // WaitableEvent to notify whether the communication is done.
   base::WaitableEvent event_;
 
   // The local port used to communicate with the TestServer spawner. This is
   // used to control the startup and shutdown of the Python TestServer running
   // on the remote machine. On Android, this port will be redirected to the
   // same port on the host machine.
-  const uint16_t port_;
+  const uint16 port_;
 
   // Helper to add |port_| to the list of the globally explicitly allowed ports.
   scoped_ptr<ScopedPortException> allowed_port_;
 
   // The next ID to use for |cur_request_| (monotonically increasing).
   int next_id_;
 
   // Request context used by |cur_request_|.
   scoped_ptr<URLRequestContext> context_;
 
   // The current (in progress) request, or NULL.
   scoped_ptr<URLRequest> cur_request_;
 
   // Only gets/sets |is_running_| on user's thread to avoid race-condition.
   bool is_running_;
 
   // Factory for creating the time-out task. This takes care of revoking
   // outstanding tasks when |this| is deleted.
   base::WeakPtrFactory<SpawnerCommunicator> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SpawnerCommunicator);
 };
 
 }  // namespace net
 
 #endif  // NET_TEST_SPAWNED_TEST_SERVER_SPAWNER_COMMUNICATOR_H_