Switch to standard integer types in chrome/browser/, part 2 of 4.

chrome/browser/metrics/variations/chrome_variations_service_client.h

 // Copyright 2015 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 CHROME_BROWSER_METRICS_VARIATIONS_CHROME_VARIATIONS_SERVICE_CLIENT_H_
 #define CHROME_BROWSER_METRICS_VARIATIONS_CHROME_VARIATIONS_SERVICE_CLIENT_H_
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
+#include "build/build_config.h"
 #include "components/variations/service/variations_service_client.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/metrics/variations/variations_registry_syncer_win.h"
 #endif
 
 // ChromeVariationsServiceClient provides an implementation of
 // VariationsServiceClient that depends on chrome/.
 class ChromeVariationsServiceClient
     : public variations::VariationsServiceClient {
@@ skipping 18 matching lines @@
   void StartGoogleUpdateRegistrySync();
 
   // Helper that handles synchronizing Variations with the Registry.
   chrome_variations::VariationsRegistrySyncer registry_syncer_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ChromeVariationsServiceClient);
 };
 
 #endif  // CHROME_BROWSER_METRICS_VARIATIONS_CHROME_VARIATIONS_SERVICE_CLIENT_H_