Switch to standard integer types in components/, part 1 of 4.

components/captive_portal/captive_portal_testing_utils.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 COMPONENTS_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TESTING_UTILS_H_
 #define COMPONENTS_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TESTING_UTILS_H_
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "components/captive_portal/captive_portal_detector.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 
 namespace base {
 class Time;
 }
 
 namespace captive_portal {
 
 class CaptivePortalDetectorTestBase {
@@ skipping 24 matching lines @@
   CaptivePortalDetector* detector_;
 
   net::TestURLFetcherFactory factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CaptivePortalDetectorTestBase);
 };
 
 }  // namespace captive_portal
 
 #endif  // COMPONENTS_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TESTING_UTILS_H_