Switch to standard integer types in ios/.

ios/web/net/clients/crw_js_injection_network_client.mm

 // 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.
 
 #import "ios/web/net/clients/crw_js_injection_network_client.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/logging.h"
 #include "base/mac/objc_property_releaser.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/metrics/histogram.h"
 #import "ios/net/crn_http_url_response.h"
 #import "ios/third_party/blink/src/html_tokenizer.h"
 
 // CRWJSInjectionNetworkClient injects an external script tag reference for
 // crweb.js into HTML and XHTML documents. To do this correctly, three data
 // points are needed: where to inject the script tag, what encoding the content
@@ skipping 337 matching lines @@
 
 - (void)sendInjectedResponseIfNeeded {
   if (!_proceedWithInjection)
     return;
 
   NSData* firstData = [_pendingData firstObject];
   NSUInteger dataLength = [firstData length];
   if (!dataLength)
     return;
 
-  const uint8* bytes = reinterpret_cast<const uint8*>([firstData bytes]);
+  const uint8_t* bytes = reinterpret_cast<const uint8_t*>([firstData bytes]);
 
   // Construct one data in which to send the content + injected script tag.
   base::scoped_nsobject<NSMutableData> combined([[NSMutableData alloc] init]);
   if (_byteOffsetAtWhichToInject)
     [combined appendBytes:static_cast<const void*>(bytes)
                    length:_byteOffsetAtWhichToInject];
 
   // Send back the JavaScript content to inject.
   [combined appendData:[self jsInjectionContent]];
   [combined
@@ skipping 79 matching lines @@
   // Get some data to investigate.
   NSData* firstData = [_pendingData firstObject];
   if (!firstData && [firstData length] < kMinimumBytesNeededForBOM) {
     NOTREACHED();
     return;
   }
 
   // Do the same check that WebKit does for the byte order mark (BOM), which
   // must be right at the beginning of the content to be accepted.
   // Info on byte order mark: http://en.wikipedia.org/wiki/Byte_order_mark
-  const uint8* bytes = reinterpret_cast<const uint8*>([firstData bytes]);
+  const uint8_t* bytes = reinterpret_cast<const uint8_t*>([firstData bytes]);
   if (BytesEqual(bytes, 0xFF, 0xFE)) {
     bytes += 2;
 
     if (!BytesEqual(bytes, 0x00, 0x00)) {
       _contentEncoding = NSUTF16LittleEndianStringEncoding;
       _headerLength += 2;
     } else {
       _contentEncoding = NSUTF32LittleEndianStringEncoding;
       _headerLength += 4;
     }
@@ skipping 40 matching lines @@
   NSData* firstData = [_pendingData firstObject];
   if (!firstData && [firstData length] < kMinimumBytesNeededForXMLDecl) {
     NOTREACHED();
     return;
   }
 
   // Do the same check that WebKit does for an XML declaration. The XML spec
   // is not exactly clear about what, if anything, can appear before an XML
   // declaration. Can there be white space? Can there be comments? WebKit only
   // accepts XML declarations if they are right at the beginning of the content.
-  const uint8* bytes = reinterpret_cast<const uint8*>([firstData bytes]);
+  const uint8_t* bytes = reinterpret_cast<const uint8_t*>([firstData bytes]);
   if (BytesEqual(bytes, '<', '?', 'x', 'm', 'l')) {
     _contentEncoding = NSISOLatin1StringEncoding;
   } else if (BytesEqual(bytes, '<', 0, '?', 0, 'x', 0)) {
     _contentEncoding = NSUTF16LittleEndianStringEncoding;
   } else if (BytesEqual(bytes, 0, '<', 0, '?', 0, 'x')) {
     _contentEncoding = NSUTF16BigEndianStringEncoding;
   } else if (BytesEqual(bytes, '<', 0, 0, 0, '?', 0, 0, 0)) {
     _contentEncoding = NSUTF32LittleEndianStringEncoding;
   } else if (BytesEqual(bytes, 0, 0, 0, '<', 0, 0, 0, '?')) {
     _contentEncoding = NSUTF32BigEndianStringEncoding;
@@ skipping 22 matching lines @@
   // It's possible that the server returned data in small chunks, so coalesce
   // the data into one buffer if needed. Try pooling everything into one chunk
   // that meets the limit of what we look at.
   [self coalesceDataIfNeeded:kLimitOfBytesToCheckForHeadTag];
 
   // Get some data to investigate. Of course we need at least
   // kMinimumBytesNeededForHTMLTag bytes to do the investigation.
   NSData* firstData = [_pendingData firstObject];
   DCHECK([firstData length] >= kMinimumBytesNeededForHTMLTag);
 
-  const uint8* bytes8 = reinterpret_cast<const uint8*>([firstData bytes]);
+  const uint8_t* bytes8 = reinterpret_cast<const uint8_t*>([firstData bytes]);
 
   WebCore::CharacterProvider provider;
   switch (_contentEncoding) {
     case NSUTF16BigEndianStringEncoding:
     case NSUTF16LittleEndianStringEncoding:
     case NSUTF32BigEndianStringEncoding:
     case NSUTF32LittleEndianStringEncoding: {
-      const uint16* bytes16 =
-          reinterpret_cast<const uint16*>(bytes8 + _headerLength);
+      const uint16_t* bytes16 =
+          reinterpret_cast<const uint16_t*>(bytes8 + _headerLength);
 
       provider.setContents(bytes16, [firstData length] - _headerLength);
 
       if (_contentEncoding == NSUTF16LittleEndianStringEncoding ||
           _contentEncoding == NSUTF32LittleEndianStringEncoding)
         provider.setLittleEndian();
       break;
     }
 
     default: {
@@ skipping 36 matching lines @@
     }
   }
 
   // There is an early exit case right at the end of the start-tag from the
   // WebCore::HTMLTokenizer::nextToken(), so double check to see if we hit
   // the limit.
   [self checkIfByteLimitPassed:provider];
 }
 
 @end