summaryrefslogtreecommitdiffstats
path: root/chrome/browser/background_sync
diff options
context:
space:
mode:
authoravi <avi@chromium.org>2015-12-25 16:59:18 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-26 01:00:22 +0000
commite4d7b6ff9e03d4d0ee39e270bd1ad5ddf0d6af5a (patch)
tree478f750ec499a805e00faa000e9353b28e6ff200 /chrome/browser/background_sync
parent2606292a9f46c507f23d878f22b7359a11c1e123 (diff)
downloadchromium_src-e4d7b6ff9e03d4d0ee39e270bd1ad5ddf0d6af5a.zip
chromium_src-e4d7b6ff9e03d4d0ee39e270bd1ad5ddf0d6af5a.tar.gz
chromium_src-e4d7b6ff9e03d4d0ee39e270bd1ad5ddf0d6af5a.tar.bz2
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}
Diffstat (limited to 'chrome/browser/background_sync')
-rw-r--r--chrome/browser/background_sync/background_sync_controller_factory.h1
-rw-r--r--chrome/browser/background_sync/background_sync_controller_impl.h3
-rw-r--r--chrome/browser/background_sync/background_sync_controller_impl_unittest.cc5
3 files changed, 8 insertions, 1 deletions
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 <stdint.h>
+
+#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 <stdint.h>
+
+#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));