Switch to standard integer types in google_apis/.

google_apis/google_api_keys_unittest.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.
 
 // Unit tests for implementation of google_api_keys namespace.
 //
 // Because the file deals with a lot of preprocessor defines and
 // optionally includes an internal header, the way we test is by
 // including the .cc file multiple times with different defines set.
 // This is a little unorthodox, but it lets us test the behavior as
 // close to unmodified as possible.
 
 #include "google_apis/google_api_keys.h"
 
+#include "base/macros.h"
 #include "build/build_config.h"
 #include "google_apis/gaia/gaia_switches.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // The Win builders fail (with a linker crash) when trying to link
 // unit_tests, and the Android builders complain about multiply
 // defined symbols (likely they don't do name decoration as well as
 // the Mac and Linux linkers).  Therefore these tests are only built
 // and run on Mac and Linux, which should provide plenty of coverage
 // since there are no platform-specific bits in this code.
 #if defined(OS_LINUX) || defined(OS_MACOSX)
 
 // We need to include everything included by google_api_keys.cc once
 // at global scope so that things like STL and classes from base don't
 // get defined when we re-include the google_api_keys.cc file
 // below. We used to include that file in its entirety here, but that
 // can cause problems if the linker decides the version of symbols
 // from that file included here is the "right" version.
+
+#include <stddef.h>
+
 #include <string>
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringize_macros.h"
 
 // This is the default baked-in value for OAuth IDs and secrets.
 static const char kDummyToken[] = "dummytoken";
@@ skipping 446 matching lines @@
   EXPECT_EQ("env-SECRET_MAIN", secret_main);
   EXPECT_EQ("env-ID_CLOUD_PRINT", id_cloud_print);
   EXPECT_EQ("env-SECRET_CLOUD_PRINT", secret_cloud_print);
   EXPECT_EQ("env-ID_REMOTING", id_remoting);
   EXPECT_EQ("env-SECRET_REMOTING", secret_remoting);
   EXPECT_EQ("env-ID_REMOTING_HOST", id_remoting_host);
   EXPECT_EQ("env-SECRET_REMOTING_HOST", secret_remoting_host);
 }
 
 #endif  // defined(OS_LINUX) || defined(OS_MACOSX)