diff options
| author | dconnelly@chromium.org <dconnelly@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-02 15:37:03 +0000 |
|---|---|---|
| committer | dconnelly@chromium.org <dconnelly@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-02 15:37:03 +0000 |
| commit | 3188f987eb2dcd36cd1b4d61993e65834ea9b4e1 (patch) | |
| tree | 3d3143279d27a5dcbcd1c1ea1657adc56cec89ab /chrome/test/base | |
| parent | fac16745228f68e71eacff8f2de59dec8a15e220 (diff) | |
| download | chromium_src-3188f987eb2dcd36cd1b4d61993e65834ea9b4e1.zip chromium_src-3188f987eb2dcd36cd1b4d61993e65834ea9b4e1.tar.gz chromium_src-3188f987eb2dcd36cd1b4d61993e65834ea9b4e1.tar.bz2 | |
Revert of https://codereview.chromium.org/92153002/
Reason for revert: broke compile
TBR=joaodasilva@chromium.org,jochen@chromium.org
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/99333002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238107 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/base')
| -rw-r--r-- | chrome/test/base/testing_profile.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc index 5770b64..73efdfb 100644 --- a/chrome/test/base/testing_profile.cc +++ b/chrome/test/base/testing_profile.cc @@ -76,10 +76,10 @@ #include "testing/gmock/include/gmock/gmock.h" #if defined(ENABLE_CONFIGURATION_POLICY) +#include "chrome/browser/policy/configuration_policy_provider.h" #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/schema.h" #else #include "chrome/browser/policy/policy_service_stub.h" |