| Index: net/test/spawned_test_server/spawner_communicator.h
|
| diff --git a/net/test/spawned_test_server/spawner_communicator.h b/net/test/spawned_test_server/spawner_communicator.h
|
| index ee1f0577dd11b87cb9ea8e11cdcbeeb76feba191..15ae0c5e1c349282a0470b8aedb34ae8476fb4a4 100644
|
| --- a/net/test/spawned_test_server/spawner_communicator.h
|
| +++ b/net/test/spawned_test_server/spawner_communicator.h
|
| @@ -5,10 +5,9 @@
|
| #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"
|
| @@ -61,7 +60,7 @@
|
| // 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.
|
| @@ -69,7 +68,7 @@
|
| // 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;
|
|
|
| @@ -123,7 +122,7 @@
|
| // 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_;
|
|
|