From e4d7b6ff9e03d4d0ee39e270bd1ad5ddf0d6af5a Mon Sep 17 00:00:00 2001 From: avi Date: Fri, 25 Dec 2015 16:59:18 -0800 Subject: Switch to standard integer types in chrome/browser/, part 1 of 4. BUG=138542 TBR=thakis@chromium.org Review URL: https://codereview.chromium.org/1542413002 Cr-Commit-Position: refs/heads/master@{#366878} --- chrome/browser/background_sync/background_sync_controller_factory.h | 1 + chrome/browser/background_sync/background_sync_controller_impl.h | 3 +++ .../background_sync/background_sync_controller_impl_unittest.cc | 5 ++++- 3 files changed, 8 insertions(+), 1 deletion(-) (limited to 'chrome/browser/background_sync') diff --git a/chrome/browser/background_sync/background_sync_controller_factory.h b/chrome/browser/background_sync/background_sync_controller_factory.h index b93dbe9..c2a10dd 100644 --- a/chrome/browser/background_sync/background_sync_controller_factory.h +++ b/chrome/browser/background_sync/background_sync_controller_factory.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_BACKGROUND_SYNC_BACKGROUND_SYNC_CONTROLLER_FACTORY_H_ #define CHROME_BROWSER_BACKGROUND_SYNC_BACKGROUND_SYNC_CONTROLLER_FACTORY_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" diff --git a/chrome/browser/background_sync/background_sync_controller_impl.h b/chrome/browser/background_sync/background_sync_controller_impl.h index 02cd41f..b8b6735 100644 --- a/chrome/browser/background_sync/background_sync_controller_impl.h +++ b/chrome/browser/background_sync/background_sync_controller_impl.h @@ -7,6 +7,9 @@ #include "content/public/browser/background_sync_controller.h" +#include + +#include "base/macros.h" #include "components/keyed_service/core/keyed_service.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/background_sync/background_sync_controller_impl_unittest.cc b/chrome/browser/background_sync/background_sync_controller_impl_unittest.cc index 3467c73..a0fc6f6 100644 --- a/chrome/browser/background_sync/background_sync_controller_impl_unittest.cc +++ b/chrome/browser/background_sync/background_sync_controller_impl_unittest.cc @@ -4,6 +4,9 @@ #include "chrome/browser/background_sync/background_sync_controller_impl.h" +#include + +#include "base/macros.h" #include "chrome/test/base/testing_profile.h" #include "components/rappor/test_rappor_service.h" #include "components/variations/variations_associated_data.h" @@ -124,7 +127,7 @@ TEST_F(BackgroundSyncControllerImplTest, AllParamsSet) { field_parameters [BackgroundSyncControllerImpl::kRetryDelayFactorParameterName] = "300"; field_parameters[BackgroundSyncControllerImpl::kMinSyncRecoveryTimeName] = - "8000000000000"; // something larger than int32. + "8000000000000"; // something larger than int32_t. ASSERT_TRUE(variations::AssociateVariationParams( BackgroundSyncControllerImpl::kFieldTrialName, kFieldTrialGroup, field_parameters)); -- cgit v1.1