diff options
Diffstat (limited to 'components/proximity_auth')
13 files changed, 21 insertions, 20 deletions
diff --git a/components/proximity_auth/DEPS b/components/proximity_auth/DEPS index 5b55479..aa6fded 100644 --- a/components/proximity_auth/DEPS +++ b/components/proximity_auth/DEPS @@ -1,4 +1,5 @@ include_rules = [ + "+components/prefs", "+components/signin/core/account_id/account_id.h", "+device/bluetooth", "+net", diff --git a/components/proximity_auth/ble/bluetooth_low_energy_device_whitelist.cc b/components/proximity_auth/ble/bluetooth_low_energy_device_whitelist.cc index 8bf905e..36425f0 100644 --- a/components/proximity_auth/ble/bluetooth_low_energy_device_whitelist.cc +++ b/components/proximity_auth/ble/bluetooth_low_energy_device_whitelist.cc @@ -8,10 +8,10 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/values.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/proximity_auth/ble/pref_names.h" #include "components/proximity_auth/logging/logging.h" diff --git a/components/proximity_auth/ble/bluetooth_low_energy_device_whitelist_unittest.cc b/components/proximity_auth/ble/bluetooth_low_energy_device_whitelist_unittest.cc index 54a74a0..5a9256f 100644 --- a/components/proximity_auth/ble/bluetooth_low_energy_device_whitelist_unittest.cc +++ b/components/proximity_auth/ble/bluetooth_low_energy_device_whitelist_unittest.cc @@ -10,7 +10,7 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/testing_pref_service.h" +#include "components/prefs/testing_pref_service.h" #include "components/proximity_auth/ble/pref_names.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/proximity_auth/cryptauth/cryptauth_device_manager.cc b/components/proximity_auth/cryptauth/cryptauth_device_manager.cc index a931cc8..8736bae 100644 --- a/components/proximity_auth/cryptauth/cryptauth_device_manager.cc +++ b/components/proximity_auth/cryptauth/cryptauth_device_manager.cc @@ -8,9 +8,9 @@ #include <utility> #include "base/base64url.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/proximity_auth/cryptauth/cryptauth_client.h" #include "components/proximity_auth/cryptauth/pref_names.h" #include "components/proximity_auth/cryptauth/sync_scheduler_impl.h" diff --git a/components/proximity_auth/cryptauth/cryptauth_device_manager_unittest.cc b/components/proximity_auth/cryptauth/cryptauth_device_manager_unittest.cc index e70f5a9..61074e9 100644 --- a/components/proximity_auth/cryptauth/cryptauth_device_manager_unittest.cc +++ b/components/proximity_auth/cryptauth/cryptauth_device_manager_unittest.cc @@ -10,10 +10,10 @@ #include "base/base64url.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/scoped_user_pref_update.h" -#include "base/prefs/testing_pref_service.h" #include "base/strings/stringprintf.h" #include "base/test/simple_test_clock.h" +#include "components/prefs/scoped_user_pref_update.h" +#include "components/prefs/testing_pref_service.h" #include "components/proximity_auth/cryptauth/fake_cryptauth_gcm_manager.h" #include "components/proximity_auth/cryptauth/mock_cryptauth_client.h" #include "components/proximity_auth/cryptauth/mock_sync_scheduler.h" diff --git a/components/proximity_auth/cryptauth/cryptauth_enrollment_manager.cc b/components/proximity_auth/cryptauth/cryptauth_enrollment_manager.cc index 22d97ec..52b288c 100644 --- a/components/proximity_auth/cryptauth/cryptauth_enrollment_manager.cc +++ b/components/proximity_auth/cryptauth/cryptauth_enrollment_manager.cc @@ -7,10 +7,10 @@ #include <utility> #include "base/base64url.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/time/clock.h" #include "base/time/time.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "components/proximity_auth/cryptauth/cryptauth_enroller.h" #include "components/proximity_auth/cryptauth/pref_names.h" #include "components/proximity_auth/cryptauth/secure_message_delegate.h" diff --git a/components/proximity_auth/cryptauth/cryptauth_enrollment_manager_unittest.cc b/components/proximity_auth/cryptauth/cryptauth_enrollment_manager_unittest.cc index 99756d0..135a42f 100644 --- a/components/proximity_auth/cryptauth/cryptauth_enrollment_manager_unittest.cc +++ b/components/proximity_auth/cryptauth/cryptauth_enrollment_manager_unittest.cc @@ -9,10 +9,10 @@ #include "base/base64url.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/testing_pref_service.h" #include "base/test/simple_test_clock.h" #include "base/time/clock.h" #include "base/time/time.h" +#include "components/prefs/testing_pref_service.h" #include "components/proximity_auth/cryptauth/cryptauth_enroller.h" #include "components/proximity_auth/cryptauth/fake_cryptauth_gcm_manager.h" #include "components/proximity_auth/cryptauth/fake_secure_message_delegate.h" diff --git a/components/proximity_auth/cryptauth/cryptauth_gcm_manager.cc b/components/proximity_auth/cryptauth/cryptauth_gcm_manager.cc index 3b4bbfa..2746c75 100644 --- a/components/proximity_auth/cryptauth/cryptauth_gcm_manager.cc +++ b/components/proximity_auth/cryptauth/cryptauth_gcm_manager.cc @@ -4,7 +4,7 @@ #include "components/proximity_auth/cryptauth/cryptauth_gcm_manager.h" -#include "base/prefs/pref_registry_simple.h" +#include "components/prefs/pref_registry_simple.h" #include "components/proximity_auth/cryptauth/pref_names.h" namespace proximity_auth { diff --git a/components/proximity_auth/cryptauth/cryptauth_gcm_manager_impl.cc b/components/proximity_auth/cryptauth/cryptauth_gcm_manager_impl.cc index 834e42a..588ddcf 100644 --- a/components/proximity_auth/cryptauth/cryptauth_gcm_manager_impl.cc +++ b/components/proximity_auth/cryptauth/cryptauth_gcm_manager_impl.cc @@ -5,9 +5,9 @@ #include "components/proximity_auth/cryptauth/cryptauth_gcm_manager_impl.h" #include "base/bind.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_util.h" #include "components/gcm_driver/gcm_driver.h" +#include "components/prefs/pref_service.h" #include "components/proximity_auth/cryptauth/pref_names.h" #include "components/proximity_auth/logging/logging.h" diff --git a/components/proximity_auth/cryptauth/cryptauth_gcm_manager_impl_unittest.cc b/components/proximity_auth/cryptauth/cryptauth_gcm_manager_impl_unittest.cc index 89fbbd8..e07ec34 100644 --- a/components/proximity_auth/cryptauth/cryptauth_gcm_manager_impl_unittest.cc +++ b/components/proximity_auth/cryptauth/cryptauth_gcm_manager_impl_unittest.cc @@ -5,9 +5,9 @@ #include "components/proximity_auth/cryptauth/cryptauth_gcm_manager_impl.h" #include "base/macros.h" -#include "base/prefs/testing_pref_service.h" #include "components/gcm_driver/fake_gcm_driver.h" #include "components/gcm_driver/gcm_client.h" +#include "components/prefs/testing_pref_service.h" #include "components/proximity_auth/cryptauth/pref_names.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/proximity_auth/proximity_auth_pref_manager.cc b/components/proximity_auth/proximity_auth_pref_manager.cc index f28e110..20c49c1 100644 --- a/components/proximity_auth/proximity_auth_pref_manager.cc +++ b/components/proximity_auth/proximity_auth_pref_manager.cc @@ -8,10 +8,10 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/values.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/proximity_auth/logging/logging.h" #include "components/proximity_auth/proximity_auth_pref_names.h" diff --git a/components/proximity_auth/proximity_auth_pref_manager_unittest.cc b/components/proximity_auth/proximity_auth_pref_manager_unittest.cc index 17a9776..662dfe4 100644 --- a/components/proximity_auth/proximity_auth_pref_manager_unittest.cc +++ b/components/proximity_auth/proximity_auth_pref_manager_unittest.cc @@ -10,7 +10,7 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/testing_pref_service.h" +#include "components/prefs/testing_pref_service.h" #include "components/proximity_auth/proximity_auth_pref_names.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/proximity_auth/webui/proximity_auth_webui_handler.cc b/components/proximity_auth/webui/proximity_auth_webui_handler.cc index 5ef9f17..80ab97e 100644 --- a/components/proximity_auth/webui/proximity_auth_webui_handler.cc +++ b/components/proximity_auth/webui/proximity_auth_webui_handler.cc @@ -10,11 +10,11 @@ #include "base/base64url.h" #include "base/bind.h" #include "base/i18n/time_formatting.h" -#include "base/prefs/pref_service.h" #include "base/thread_task_runner_handle.h" #include "base/time/default_clock.h" #include "base/time/default_tick_clock.h" #include "base/values.h" +#include "components/prefs/pref_service.h" #include "components/proximity_auth/ble/pref_names.h" #include "components/proximity_auth/bluetooth_connection_finder.h" #include "components/proximity_auth/cryptauth/cryptauth_enrollment_manager.h" |