summaryrefslogtreecommitdiffstats
path: root/chromeos/timezone/timezone_resolver.cc
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2016-02-03 00:22:02 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-03 08:23:19 +0000
commit066508682fd2bcf566f83c39169df4b949ccf09a (patch)
treed4bb15e5eac7ed880afbf380fe9786e1d7434bca /chromeos/timezone/timezone_resolver.cc
parentf531e094ae328f316e7ad3a08a4ce32f5b087e6b (diff)
downloadchromium_src-066508682fd2bcf566f83c39169df4b949ccf09a.zip
chromium_src-066508682fd2bcf566f83c39169df4b949ccf09a.tar.gz
chromium_src-066508682fd2bcf566f83c39169df4b949ccf09a.tar.bz2
Delete base/prefs and update callers to use components.
Deletes the forwarding headers in base/prefs. Updates the remaining users of base/prefs includes to use components/prefs. Sort headers in updated files. Move PrefServiceFactory out of the base namespace. Update users. Update all preprocessor stuff in components/prefs to change BASE_PREFS_ to COMPONENTS_PREFS_. Add components/prefs to DEPS file of directories where checkdeps fails after the update. BUG=583034 Reland of http://crrev.com/1662523004#ps40001 with fix. TBR=estade@chromium.org Review URL: https://codereview.chromium.org/1668463002 Cr-Commit-Position: refs/heads/master@{#373197}
Diffstat (limited to 'chromeos/timezone/timezone_resolver.cc')
-rw-r--r--chromeos/timezone/timezone_resolver.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chromeos/timezone/timezone_resolver.cc b/chromeos/timezone/timezone_resolver.cc
index 5938654..c6ebfb4 100644
--- a/chromeos/timezone/timezone_resolver.cc
+++ b/chromeos/timezone/timezone_resolver.cc
@@ -15,14 +15,14 @@
#include "base/macros.h"
#include "base/power_monitor/power_monitor.h"
#include "base/power_monitor/power_observer.h"
-#include "base/prefs/pref_registry_simple.h"
-#include "base/prefs/pref_service.h"
#include "base/rand_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
#include "chromeos/geolocation/geoposition.h"
#include "chromeos/geolocation/simple_geolocation_provider.h"
#include "chromeos/timezone/timezone_provider.h"
+#include "components/prefs/pref_registry_simple.h"
+#include "components/prefs/pref_service.h"
namespace chromeos {