[Android] Fix gn build for instrumentation tests.

tools/android/common/adb_connection.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 "tools/android/common/adb_connection.h"
 
 #include <arpa/inet.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ skipping 16 matching lines @@
   }
 }
 
 }  // namespace
 
 int ConnectAdbHostSocket(const char* forward_to) {
   // ADB port forward request format: HHHHtcp:port:address.
   // HHHH is the hexidecimal length of the "tcp:port:address" part.
   const size_t kBufferMaxLength = 30;
   const size_t kLengthOfLength = 4;
-  const size_t kAddressMaxLength = kBufferMaxLength - kLengthOfLength;
 
   const char kAddressPrefix[] = { 't', 'c', 'p', ':' };
   size_t address_length = arraysize(kAddressPrefix) + strlen(forward_to);
   if (address_length > kBufferMaxLength - kLengthOfLength) {
     LOG(ERROR) << "Forward to address is too long: " << forward_to;
     return -1;
   }
 
   char request[kBufferMaxLength];
   memcpy(request + kLengthOfLength, kAddressPrefix, arraysize(kAddressPrefix));
@@ skipping 34 matching lines @@
     if (ret < 0) {
       LOG(ERROR) << "Failed to send request: " << strerror(errno);
       CloseSocket(host_socket);
       return -1;
     }
 
     bytes_sent += ret;
     bytes_remaining -= ret;
   }
 
-  const size_t kAdbStatusLength = 4;
+  const int kAdbStatusLength = 4;
   char response[kBufferMaxLength];
   int response_length = HANDLE_EINTR(recv(host_socket, response,
                                           kBufferMaxLength, 0));
   if (response_length < kAdbStatusLength ||
       strncmp("OKAY", response, kAdbStatusLength) != 0) {
     LOG(ERROR) << "Bad response from ADB: length: " << response_length
                << " data: " << DumpBinary(response, response_length);
     CloseSocket(host_socket);
     return -1;
   }
 
   return host_socket;
 }
 
 }  // namespace tools