diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-08 21:10:04 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-08 21:10:04 +0000 |
| commit | 76b4b15804dafa5e586738bd7c8ac12fea6ddec2 (patch) | |
| tree | 4ba2cb5383bb9ef5f610aeffe5d4455149da683b /chrome/test/base/testing_profile.cc | |
| parent | 415b2de91f4a96c6779650c2a94e28012c7d61e7 (diff) | |
| download | chromium_src-76b4b15804dafa5e586738bd7c8ac12fea6ddec2.zip chromium_src-76b4b15804dafa5e586738bd7c8ac12fea6ddec2.tar.gz chromium_src-76b4b15804dafa5e586738bd7c8ac12fea6ddec2.tar.bz2 | |
Move policy code into components/policy.
The code moved to component/policy can be included on iOS, but can't depend
on chrome/. This move includes an exception for the policy protobufs:
- the generic cloud policy protobufs will be moved into a new repository,
due to a dependency from a ChromeOS package
- the user cloud policy protobuf and its decoding will move into a new component
for user policy
BUG=271392
TBR=jochen@chromium.org
Review URL: https://codereview.chromium.org/109743002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/base/testing_profile.cc')
| -rw-r--r-- | chrome/test/base/testing_profile.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc index 5b623a4..816e6bc 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) |