| Index: chrome/test/base/testing_profile.cc
|
| diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
|
| index 5b623a468ff9beb09053b3e884aeeaba0e47fb4a..816e6bc82d0646c39418e8d4b5ad5e5fd4acf74f 100644
|
| --- a/chrome/test/base/testing_profile.cc
|
| +++ b/chrome/test/base/testing_profile.cc
|
| @@ -41,7 +41,6 @@
|
| #include "chrome/browser/net/proxy_service_factory.h"
|
| #include "chrome/browser/notifications/desktop_notification_service.h"
|
| #include "chrome/browser/notifications/desktop_notification_service_factory.h"
|
| -#include "chrome/browser/policy/policy_service.h"
|
| #include "chrome/browser/policy/profile_policy_connector.h"
|
| #include "chrome/browser/policy/profile_policy_connector_factory.h"
|
| #include "chrome/browser/prefs/browser_prefs.h"
|
| @@ -61,6 +60,7 @@
|
| #include "chrome/test/base/testing_pref_service_syncable.h"
|
| #include "chrome/test/base/ui_test_utils.h"
|
| #include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
|
| +#include "components/policy/core/common/policy_service.h"
|
| #include "components/user_prefs/user_prefs.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/notification_service.h"
|
| @@ -76,13 +76,13 @@
|
| #include "testing/gmock/include/gmock/gmock.h"
|
|
|
| #if defined(ENABLE_CONFIGURATION_POLICY)
|
| -#include "chrome/browser/policy/policy_service_impl.h"
|
| #include "chrome/browser/policy/schema_registry_service.h"
|
| #include "chrome/browser/policy/schema_registry_service_factory.h"
|
| #include "components/policy/core/common/configuration_policy_provider.h"
|
| +#include "components/policy/core/common/policy_service_impl.h"
|
| #include "components/policy/core/common/schema.h"
|
| #else
|
| -#include "chrome/browser/policy/policy_service_stub.h"
|
| +#include "components/policy/core/common/policy_service_stub.h"
|
| #endif // defined(ENABLE_CONFIGURATION_POLICY)
|
|
|
| #if defined(ENABLE_MANAGED_USERS)
|
|
|