summaryrefslogtreecommitdiffstats
path: root/components/keyed_service
diff options
context:
space:
mode:
authoravi <avi@chromium.org>2015-12-25 16:14:18 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-26 00:15:07 +0000
commit2606292a9f46c507f23d878f22b7359a11c1e123 (patch)
tree0903f51c8795f4afa034c755fd3ad7e64e3d8843 /components/keyed_service
parent2775074893c41f04e5b3728faeed32affc7d116f (diff)
downloadchromium_src-2606292a9f46c507f23d878f22b7359a11c1e123.zip
chromium_src-2606292a9f46c507f23d878f22b7359a11c1e123.tar.gz
chromium_src-2606292a9f46c507f23d878f22b7359a11c1e123.tar.bz2
Switch to standard integer types in components/, part 2 of 4.
BUG=138542 TBR=blundell@chromium.org Review URL: https://codereview.chromium.org/1548113002 Cr-Commit-Position: refs/heads/master@{#366877}
Diffstat (limited to 'components/keyed_service')
-rw-r--r--components/keyed_service/content/browser_context_keyed_service_factory.h2
-rw-r--r--components/keyed_service/content/browser_context_keyed_service_shutdown_notifier_factory.h1
-rw-r--r--components/keyed_service/content/refcounted_browser_context_keyed_service_factory.h2
-rw-r--r--components/keyed_service/core/dependency_graph.cc2
-rw-r--r--components/keyed_service/core/dependency_graph.h1
-rw-r--r--components/keyed_service/core/dependency_graph_unittest.cc1
-rw-r--r--components/keyed_service/core/keyed_service_factory.h2
-rw-r--r--components/keyed_service/core/keyed_service_shutdown_notifier.h1
-rw-r--r--components/keyed_service/core/refcounted_keyed_service_factory.h2
-rw-r--r--components/keyed_service/ios/browser_state_keyed_service_factory.h2
-rw-r--r--components/keyed_service/ios/refcounted_browser_state_keyed_service_factory.h2
11 files changed, 12 insertions, 6 deletions
diff --git a/components/keyed_service/content/browser_context_keyed_service_factory.h b/components/keyed_service/content/browser_context_keyed_service_factory.h
index 5543bbd..ca138af 100644
--- a/components/keyed_service/content/browser_context_keyed_service_factory.h
+++ b/components/keyed_service/content/browser_context_keyed_service_factory.h
@@ -5,8 +5,8 @@
#ifndef COMPONENTS_KEYED_SERVICE_CONTENT_BROWSER_CONTEXT_KEYED_SERVICE_FACTORY_H_
#define COMPONENTS_KEYED_SERVICE_CONTENT_BROWSER_CONTEXT_KEYED_SERVICE_FACTORY_H_
-#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "components/keyed_service/core/keyed_service_export.h"
#include "components/keyed_service/core/keyed_service_factory.h"
diff --git a/components/keyed_service/content/browser_context_keyed_service_shutdown_notifier_factory.h b/components/keyed_service/content/browser_context_keyed_service_shutdown_notifier_factory.h
index dee6302..21816b2 100644
--- a/components/keyed_service/content/browser_context_keyed_service_shutdown_notifier_factory.h
+++ b/components/keyed_service/content/browser_context_keyed_service_shutdown_notifier_factory.h
@@ -5,6 +5,7 @@
#ifndef COMPONENTS_KEYED_SERVICE_CONTENT_BROWSER_CONTEXT_KEYED_SERVICE_SHUTDOWN_NOTIFIER_FACTORY_H_
#define COMPONENTS_KEYED_SERVICE_CONTENT_BROWSER_CONTEXT_KEYED_SERVICE_SHUTDOWN_NOTIFIER_FACTORY_H_
+#include "base/macros.h"
#include "components/keyed_service/content/browser_context_keyed_service_factory.h"
#include "components/keyed_service/core/keyed_service_export.h"
diff --git a/components/keyed_service/content/refcounted_browser_context_keyed_service_factory.h b/components/keyed_service/content/refcounted_browser_context_keyed_service_factory.h
index f8350fd..8df82ea 100644
--- a/components/keyed_service/content/refcounted_browser_context_keyed_service_factory.h
+++ b/components/keyed_service/content/refcounted_browser_context_keyed_service_factory.h
@@ -5,8 +5,8 @@
#ifndef COMPONENTS_KEYED_SERVICE_CONTENT_REFCOUNTED_BROWSER_CONTEXT_KEYED_SERVICE_FACTORY_H_
#define COMPONENTS_KEYED_SERVICE_CONTENT_REFCOUNTED_BROWSER_CONTEXT_KEYED_SERVICE_FACTORY_H_
-#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "components/keyed_service/core/keyed_service_export.h"
#include "components/keyed_service/core/refcounted_keyed_service_factory.h"
diff --git a/components/keyed_service/core/dependency_graph.cc b/components/keyed_service/core/dependency_graph.cc
index b1b31c6..3a4a5a1 100644
--- a/components/keyed_service/core/dependency_graph.cc
+++ b/components/keyed_service/core/dependency_graph.cc
@@ -4,6 +4,8 @@
#include "components/keyed_service/core/dependency_graph.h"
+#include <stddef.h>
+
#include <algorithm>
#include <deque>
#include <iterator>
diff --git a/components/keyed_service/core/dependency_graph.h b/components/keyed_service/core/dependency_graph.h
index 98203b2..7615156 100644
--- a/components/keyed_service/core/dependency_graph.h
+++ b/components/keyed_service/core/dependency_graph.h
@@ -11,6 +11,7 @@
#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "components/keyed_service/core/keyed_service_export.h"
class DependencyNode;
diff --git a/components/keyed_service/core/dependency_graph_unittest.cc b/components/keyed_service/core/dependency_graph_unittest.cc
index a7f47c0..f8538a6 100644
--- a/components/keyed_service/core/dependency_graph_unittest.cc
+++ b/components/keyed_service/core/dependency_graph_unittest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/bind.h"
+#include "base/macros.h"
#include "base/numerics/safe_conversions.h"
#include "base/strings/string_piece.h"
#include "components/keyed_service/core/dependency_graph.h"
diff --git a/components/keyed_service/core/keyed_service_factory.h b/components/keyed_service/core/keyed_service_factory.h
index e2ef4b8..1374a25 100644
--- a/components/keyed_service/core/keyed_service_factory.h
+++ b/components/keyed_service/core/keyed_service_factory.h
@@ -7,9 +7,9 @@
#include <map>
-#include "base/basictypes.h"
#include "base/callback_forward.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "components/keyed_service/core/keyed_service_base_factory.h"
#include "components/keyed_service/core/keyed_service_export.h"
diff --git a/components/keyed_service/core/keyed_service_shutdown_notifier.h b/components/keyed_service/core/keyed_service_shutdown_notifier.h
index 2f2ca29..51f130d 100644
--- a/components/keyed_service/core/keyed_service_shutdown_notifier.h
+++ b/components/keyed_service/core/keyed_service_shutdown_notifier.h
@@ -6,6 +6,7 @@
#define COMPONENTS_KEYED_SERVICE_CORE_KEYED_SERVICE_SHUTDOWN_NOTIFIER_H_
#include "base/callback_list.h"
+#include "base/macros.h"
#include "components/keyed_service/core/keyed_service.h"
// This is a helper class for objects that depend on one or more keyed services,
diff --git a/components/keyed_service/core/refcounted_keyed_service_factory.h b/components/keyed_service/core/refcounted_keyed_service_factory.h
index de8b3b4..ea0e3a6 100644
--- a/components/keyed_service/core/refcounted_keyed_service_factory.h
+++ b/components/keyed_service/core/refcounted_keyed_service_factory.h
@@ -7,8 +7,8 @@
#include <map>
-#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "components/keyed_service/core/keyed_service_base_factory.h"
#include "components/keyed_service/core/keyed_service_export.h"
diff --git a/components/keyed_service/ios/browser_state_keyed_service_factory.h b/components/keyed_service/ios/browser_state_keyed_service_factory.h
index a3fb2b6..b344833 100644
--- a/components/keyed_service/ios/browser_state_keyed_service_factory.h
+++ b/components/keyed_service/ios/browser_state_keyed_service_factory.h
@@ -5,8 +5,8 @@
#ifndef COMPONENTS_KEYED_SERVICE_IOS_BROWSER_STATE_KEYED_SERVICE_FACTORY_H_
#define COMPONENTS_KEYED_SERVICE_IOS_BROWSER_STATE_KEYED_SERVICE_FACTORY_H_
-#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "components/keyed_service/core/keyed_service_export.h"
#include "components/keyed_service/core/keyed_service_factory.h"
diff --git a/components/keyed_service/ios/refcounted_browser_state_keyed_service_factory.h b/components/keyed_service/ios/refcounted_browser_state_keyed_service_factory.h
index 9ae5ae1..383bdba 100644
--- a/components/keyed_service/ios/refcounted_browser_state_keyed_service_factory.h
+++ b/components/keyed_service/ios/refcounted_browser_state_keyed_service_factory.h
@@ -5,8 +5,8 @@
#ifndef COMPONENTS_KEYED_SERVICE_IOS_REFCOUNTED_BROWSER_STATE_KEYED_SERVICE_FACTORY_H_
#define COMPONENTS_KEYED_SERVICE_IOS_REFCOUNTED_BROWSER_STATE_KEYED_SERVICE_FACTORY_H_
-#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "components/keyed_service/core/keyed_service_export.h"
#include "components/keyed_service/core/refcounted_keyed_service_factory.h"