diff options
Diffstat (limited to 'chrome/browser/chromeos')
5 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/display/display_preferences_unittest.cc b/chrome/browser/chromeos/display/display_preferences_unittest.cc index ac03659..6a31b77 100644 --- a/chrome/browser/chromeos/display/display_preferences_unittest.cc +++ b/chrome/browser/chromeos/display/display_preferences_unittest.cc @@ -8,6 +8,7 @@ #include "ash/screen_ash.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" +#include "base/prefs/testing_pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/chromeos/login/mock_user_manager.h" @@ -15,7 +16,6 @@ #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_browser_process.h" -#include "chrome/test/base/testing_pref_service.h" namespace chromeos { namespace { diff --git a/chrome/browser/chromeos/login/user_manager_unittest.cc b/chrome/browser/chromeos/login/user_manager_unittest.cc index c82913c..85d8362 100644 --- a/chrome/browser/chromeos/login/user_manager_unittest.cc +++ b/chrome/browser/chromeos/login/user_manager_unittest.cc @@ -8,6 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/prefs/pref_service.h" +#include "base/prefs/testing_pref_service.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/cros/cros_library.h" @@ -21,7 +22,6 @@ #include "chrome/browser/chromeos/settings/device_settings_service.h" #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h" #include "chrome/test/base/testing_browser_process.h" -#include "chrome/test/base/testing_pref_service.h" #include "content/public/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/power/session_length_limiter_unittest.cc b/chrome/browser/chromeos/power/session_length_limiter_unittest.cc index bf9a477..82e2ac5 100644 --- a/chrome/browser/chromeos/power/session_length_limiter_unittest.cc +++ b/chrome/browser/chromeos/power/session_length_limiter_unittest.cc @@ -14,13 +14,13 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "base/prefs/testing_pref_service.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" #include "base/thread_task_runner_handle.h" #include "base/values.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_browser_process.h" -#include "chrome/test/base/testing_pref_service.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc index 23a1aa1..a2d11d1 100644 --- a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc +++ b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc @@ -11,11 +11,11 @@ #include "base/format_macros.h" #include "base/logging.h" #include "base/message_loop.h" +#include "base/prefs/testing_pref_service.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/common/pref_names.h" -#include "chrome/test/base/testing_pref_service.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "content/public/test/test_browser_thread.h" #include "net/proxy/proxy_config_service_common_unittest.h" diff --git a/chrome/browser/chromeos/settings/device_settings_cache_unittest.cc b/chrome/browser/chromeos/settings/device_settings_cache_unittest.cc index 9b7a016..4471f39 100644 --- a/chrome/browser/chromeos/settings/device_settings_cache_unittest.cc +++ b/chrome/browser/chromeos/settings/device_settings_cache_unittest.cc @@ -4,10 +4,10 @@ #include "chrome/browser/chromeos/settings/device_settings_cache.h" +#include "base/prefs/testing_pref_service.h" #include "chrome/browser/policy/proto/chrome_device_policy.pb.h" #include "chrome/browser/policy/proto/device_management_backend.pb.h" #include "chrome/common/pref_names.h" -#include "chrome/test/base/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest.h" namespace em = enterprise_management; |