diff options
32 files changed, 95 insertions, 73 deletions
diff --git a/chrome/browser/android/signin/signin_manager_android.cc b/chrome/browser/android/signin/signin_manager_android.cc index 3c9fa44..132f15f 100644 --- a/chrome/browser/android/signin/signin_manager_android.cc +++ b/chrome/browser/android/signin/signin_manager_android.cc @@ -29,12 +29,12 @@ #if defined(ENABLE_CONFIGURATION_POLICY) #include "chrome/browser/policy/browser_policy_connector.h" -#include "chrome/browser/policy/cloud/user_cloud_policy_manager.h" #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" #include "chrome/browser/policy/cloud/user_policy_signin_service_android.h" #include "chrome/browser/policy/cloud/user_policy_signin_service_factory.h" #include "components/policy/core/common/cloud/cloud_policy_core.h" #include "components/policy/core/common/cloud/cloud_policy_store.h" +#include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #include "google_apis/gaia/gaia_auth_util.h" #endif diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_store.h b/chrome/browser/chromeos/policy/device_local_account_policy_store.h index e8ac62e..d0e2192 100644 --- a/chrome/browser/chromeos/policy/device_local_account_policy_store.h +++ b/chrome/browser/chromeos/policy/device_local_account_policy_store.h @@ -13,8 +13,8 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/settings/device_settings_service.h" -#include "chrome/browser/policy/cloud/user_cloud_policy_store_base.h" #include "components/policy/core/common/cloud/cloud_policy_validator.h" +#include "components/policy/core/common/cloud/user_cloud_policy_store_base.h" namespace base { class SequencedTaskRunner; diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h index 39696b48..1e78869 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h +++ b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h @@ -14,9 +14,9 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "chrome/browser/policy/cloud/user_cloud_policy_store_base.h" #include "chromeos/dbus/dbus_method_call_status.h" #include "components/policy/core/common/cloud/cloud_policy_validator.h" +#include "components/policy/core/common/cloud/user_cloud_policy_store_base.h" namespace base { class SequencedTaskRunner; diff --git a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc index f487ccf..57e174f 100644 --- a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc +++ b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc @@ -51,10 +51,10 @@ #include "chromeos/chromeos_paths.h" #include "chromeos/dbus/cryptohome_client.h" #else -#include "chrome/browser/policy/cloud/user_cloud_policy_manager.h" #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" +#include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #endif using testing::AnyNumber; diff --git a/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc index ce1b5b9..9bc3384 100644 --- a/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc +++ b/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc @@ -26,10 +26,10 @@ #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h" #else -#include "chrome/browser/policy/cloud/user_cloud_policy_manager.h" #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" +#include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #endif using content::BrowserThread; diff --git a/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc index 34703fb..dfccc44 100644 --- a/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc +++ b/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc @@ -40,10 +40,10 @@ #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h" #include "chromeos/chromeos_switches.h" #else -#include "chrome/browser/policy/cloud/user_cloud_policy_manager.h" #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" +#include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #endif using testing::InvokeWithoutArgs; diff --git a/chrome/browser/policy/cloud/policy_header_service_factory.cc b/chrome/browser/policy/cloud/policy_header_service_factory.cc index 46eda86..83f94d9 100644 --- a/chrome/browser/policy/cloud/policy_header_service_factory.cc +++ b/chrome/browser/policy/cloud/policy_header_service_factory.cc @@ -18,8 +18,8 @@ #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h" #else -#include "chrome/browser/policy/cloud/user_cloud_policy_manager.h" #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" +#include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #endif namespace policy { diff --git a/chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.cc b/chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.cc index 5ccb2db..d91d31e 100644 --- a/chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.cc +++ b/chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.cc @@ -14,8 +14,8 @@ #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h" #else -#include "chrome/browser/policy/cloud/user_cloud_policy_manager.h" #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" +#include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #endif namespace policy { diff --git a/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.cc b/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.cc index 81d727c..08b40db 100644 --- a/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.cc +++ b/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.cc @@ -8,13 +8,13 @@ #include "base/logging.h" #include "base/message_loop/message_loop_proxy.h" #include "base/sequenced_task_runner.h" -#include "chrome/browser/policy/cloud/user_cloud_policy_manager.h" -#include "chrome/browser/policy/cloud/user_cloud_policy_store.h" #include "chrome/browser/policy/schema_registry_service.h" #include "chrome/browser/policy/schema_registry_service_factory.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" #include "components/policy/core/common/cloud/cloud_external_data_manager.h" +#include "components/policy/core/common/cloud/user_cloud_policy_manager.h" +#include "components/policy/core/common/cloud/user_cloud_policy_store.h" #include "content/public/browser/browser_context.h" namespace policy { diff --git a/chrome/browser/policy/cloud/user_policy_signin_service.cc b/chrome/browser/policy/cloud/user_policy_signin_service.cc index e0031df..a23ef94 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service.cc +++ b/chrome/browser/policy/cloud/user_policy_signin_service.cc @@ -9,13 +9,13 @@ #include "base/callback.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/policy/cloud/user_cloud_policy_manager.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "components/policy/core/common/cloud/cloud_policy_client_registration_helper.h" +#include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "google_apis/gaia/gaia_constants.h" diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_android.cc b/chrome/browser/policy/cloud/user_policy_signin_service_android.cc index dd2e921a..f4d02c6 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service_android.cc +++ b/chrome/browser/policy/cloud/user_policy_signin_service_android.cc @@ -12,13 +12,13 @@ #include "base/message_loop/message_loop.h" #include "base/prefs/pref_service.h" #include "base/time/time.h" -#include "chrome/browser/policy/cloud/user_cloud_policy_manager.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/common/pref_names.h" #include "components/policy/core/common/cloud/cloud_policy_client_registration_helper.h" +#include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #include "components/policy/core/common/policy_switches.h" #include "net/base/network_change_notifier.h" #include "net/url_request/url_request_context_getter.h" diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_base.cc b/chrome/browser/policy/cloud/user_policy_signin_service_base.cc index 76aeca8..9ed7682 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service_base.cc +++ b/chrome/browser/policy/cloud/user_policy_signin_service_base.cc @@ -9,13 +9,13 @@ #include "base/message_loop/message_loop.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/policy/browser_policy_connector.h" -#include "chrome/browser/policy/cloud/user_cloud_policy_manager.h" #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/common/chrome_switches.h" #include "components/policy/core/common/cloud/device_management_service.h" #include "components/policy/core/common/cloud/system_policy_request_context.h" +#include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #include "components/policy/core/common/cloud/user_policy_request_context.h" #include "content/public/browser/notification_source.h" #include "content/public/common/content_client.h" diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc b/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc index a9f4b79..7f3ba18 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc +++ b/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc @@ -11,8 +11,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/policy/browser_policy_connector.h" -#include "chrome/browser/policy/cloud/mock_user_cloud_policy_store.h" -#include "chrome/browser/policy/cloud/user_cloud_policy_manager.h" #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" #include "chrome/browser/policy/cloud/user_policy_signin_service_factory.h" #include "chrome/browser/prefs/browser_prefs.h" @@ -28,6 +26,8 @@ #include "components/policy/core/common/cloud/cloud_external_data_manager.h" #include "components/policy/core/common/cloud/cloud_policy_constants.h" #include "components/policy/core/common/cloud/mock_device_management_service.h" +#include "components/policy/core/common/cloud/mock_user_cloud_policy_store.h" +#include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #include "components/policy/core/common/schema_registry.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/notification_details.h" diff --git a/chrome/browser/policy/profile_policy_connector_factory.cc b/chrome/browser/policy/profile_policy_connector_factory.cc index c6aa37d..f7f15e2 100644 --- a/chrome/browser/policy/profile_policy_connector_factory.cc +++ b/chrome/browser/policy/profile_policy_connector_factory.cc @@ -22,8 +22,8 @@ #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" #else -#include "chrome/browser/policy/cloud/user_cloud_policy_manager.h" #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" +#include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #endif #endif diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index b1fa920..c84558e 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -105,8 +105,8 @@ #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h" #else -#include "chrome/browser/policy/cloud/user_cloud_policy_manager.h" #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" +#include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #endif #endif diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc index 1973379..ce23822 100644 --- a/chrome/browser/profiles/profile_io_data.cc +++ b/chrome/browser/profiles/profile_io_data.cc @@ -83,9 +83,9 @@ #if defined(ENABLE_CONFIGURATION_POLICY) #include "chrome/browser/policy/cloud/policy_header_service.h" #include "chrome/browser/policy/cloud/policy_header_service_factory.h" -#include "chrome/browser/policy/cloud/user_cloud_policy_manager.h" #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" #include "components/policy/core/browser/policy_header_io_helper.h" +#include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #endif #if defined(ENABLE_MANAGED_USERS) diff --git a/chrome/browser/ui/webui/policy_ui.cc b/chrome/browser/ui/webui/policy_ui.cc index fbc1d5c..77c4c52 100644 --- a/chrome/browser/ui/webui/policy_ui.cc +++ b/chrome/browser/ui/webui/policy_ui.cc @@ -61,8 +61,8 @@ #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h" #else -#include "chrome/browser/policy/cloud/user_cloud_policy_manager.h" #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" +#include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #include "content/public/browser/web_contents.h" #endif diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 5775bc9..584aaf5 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -1473,14 +1473,8 @@ 'browser/policy/cloud/user_cloud_policy_invalidator_factory.h', 'browser/policy/cloud/user_cloud_policy_invalidator.cc', 'browser/policy/cloud/user_cloud_policy_invalidator.h', - 'browser/policy/cloud/user_cloud_policy_manager.cc', - 'browser/policy/cloud/user_cloud_policy_manager.h', 'browser/policy/cloud/user_cloud_policy_manager_factory.cc', 'browser/policy/cloud/user_cloud_policy_manager_factory.h', - 'browser/policy/cloud/user_cloud_policy_store.cc', - 'browser/policy/cloud/user_cloud_policy_store.h', - 'browser/policy/cloud/user_cloud_policy_store_base.cc', - 'browser/policy/cloud/user_cloud_policy_store_base.h', 'browser/policy/cloud/user_policy_signin_service.cc', 'browser/policy/cloud/user_policy_signin_service.h', 'browser/policy/cloud/user_policy_signin_service_android.cc', @@ -2941,12 +2935,8 @@ 'browser/password_manager/native_backend_kwallet_x.cc', 'browser/password_manager/native_backend_kwallet_x.h', 'browser/platform_util_linux.cc', - 'browser/policy/cloud/user_cloud_policy_manager.cc', - 'browser/policy/cloud/user_cloud_policy_manager.h', 'browser/policy/cloud/user_cloud_policy_manager_factory.cc', 'browser/policy/cloud/user_cloud_policy_manager_factory.h', - 'browser/policy/cloud/user_cloud_policy_store.cc', - 'browser/policy/cloud/user_cloud_policy_store.h', 'browser/policy/cloud/user_policy_signin_service.cc', 'browser/policy/cloud/user_policy_signin_service.h', 'browser/policy/cloud/user_policy_signin_service_base.cc', diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index cd8b740..cc30a5c 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -1089,11 +1089,7 @@ 'browser/policy/autofill_policy_handler_unittest.cc', 'browser/policy/browser_policy_connector_unittest.cc', 'browser/policy/cloud/cloud_policy_invalidator_unittest.cc', - 'browser/policy/cloud/mock_user_cloud_policy_store.cc', - 'browser/policy/cloud/mock_user_cloud_policy_store.h', 'browser/policy/cloud/policy_header_service_unittest.cc', - 'browser/policy/cloud/user_cloud_policy_manager_unittest.cc', - 'browser/policy/cloud/user_cloud_policy_store_unittest.cc', 'browser/policy/cloud/user_policy_signin_service_unittest.cc', 'browser/policy/configuration_policy_handler_unittest.cc', 'browser/policy/configuration_policy_pref_store_test.cc', @@ -2308,10 +2304,6 @@ 'sources!': [ 'browser/password_manager/native_backend_gnome_x_unittest.cc', 'browser/password_manager/native_backend_kwallet_x_unittest.cc', - 'browser/policy/cloud/mock_user_cloud_policy_store.cc', - 'browser/policy/cloud/mock_user_cloud_policy_store.h', - 'browser/policy/cloud/user_cloud_policy_manager_unittest.cc', - 'browser/policy/cloud/user_cloud_policy_store_unittest.cc', 'browser/policy/cloud/user_policy_signin_service_unittest.cc', 'browser/profiles/profile_list_desktop_unittest.cc', 'browser/safe_browsing/download_protection_service_unittest.cc', diff --git a/components/components_tests.gyp b/components/components_tests.gyp index 49e32a3..2c1eea3 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -189,6 +189,9 @@ }], ['configuration_policy==1', { 'dependencies': [ + # TODO(joaodasilva): remove this dependency. This is needed to + # get the include path for policy_constants.h. + '../chrome/app/policy/cloud_policy_codegen.gyp:policy_test_support', 'components.gyp:policy_component_test_support', ], 'sources': [ @@ -208,6 +211,8 @@ 'policy/core/common/cloud/external_policy_data_updater_unittest.cc', 'policy/core/common/cloud/rate_limiter_unittest.cc', 'policy/core/common/cloud/resource_cache_unittest.cc', + 'policy/core/common/cloud/user_cloud_policy_manager_unittest.cc', + 'policy/core/common/cloud/user_cloud_policy_store_unittest.cc', 'policy/core/common/cloud/user_info_fetcher_unittest.cc', 'policy/core/common/config_dir_policy_loader_unittest.cc', 'policy/core/common/forwarding_policy_provider_unittest.cc', @@ -236,6 +241,12 @@ 'policy/core/common/config_dir_policy_loader_unittest.cc', ], }], + ['chromeos==1', { + 'sources!': [ + 'policy/core/common/cloud/user_cloud_policy_manager_unittest.cc', + 'policy/core/common/cloud/user_cloud_policy_store_unittest.cc', + ], + }], ], }], ], diff --git a/components/policy.gypi b/components/policy.gypi index af9db89..a69a1f1 100644 --- a/components/policy.gypi +++ b/components/policy.gypi @@ -83,6 +83,12 @@ 'policy/core/common/cloud/resource_cache.h', 'policy/core/common/cloud/system_policy_request_context.cc', 'policy/core/common/cloud/system_policy_request_context.h', + 'policy/core/common/cloud/user_cloud_policy_manager.cc', + 'policy/core/common/cloud/user_cloud_policy_manager.h', + 'policy/core/common/cloud/user_cloud_policy_store.cc', + 'policy/core/common/cloud/user_cloud_policy_store.h', + 'policy/core/common/cloud/user_cloud_policy_store_base.cc', + 'policy/core/common/cloud/user_cloud_policy_store_base.h', 'policy/core/common/cloud/user_info_fetcher.cc', 'policy/core/common/cloud/user_info_fetcher.h', 'policy/core/common/cloud/user_policy_request_context.cc', @@ -170,6 +176,10 @@ 'sources!': [ 'policy/core/common/cloud/cloud_policy_client_registration_helper.cc', 'policy/core/common/cloud/cloud_policy_client_registration_helper.h', + 'policy/core/common/cloud/user_cloud_policy_manager.cc', + 'policy/core/common/cloud/user_cloud_policy_manager.h', + 'policy/core/common/cloud/user_cloud_policy_store.cc', + 'policy/core/common/cloud/user_cloud_policy_store.h', ], }], ], @@ -251,6 +261,8 @@ 'policy/core/common/cloud/mock_cloud_policy_store.h', 'policy/core/common/cloud/mock_device_management_service.cc', 'policy/core/common/cloud/mock_device_management_service.h', + 'policy/core/common/cloud/mock_user_cloud_policy_store.cc', + 'policy/core/common/cloud/mock_user_cloud_policy_store.h', 'policy/core/common/cloud/policy_builder.cc', 'policy/core/common/cloud/policy_builder.h', 'policy/core/common/configuration_policy_provider_test.cc', @@ -264,6 +276,14 @@ 'policy/core/common/preferences_mock_mac.cc', 'policy/core/common/preferences_mock_mac.h', ], + 'conditions': [ + ['chromeos==1', { + 'sources!': [ + 'policy/core/common/cloud/mock_user_cloud_policy_store.cc', + 'policy/core/common/cloud/mock_user_cloud_policy_store.h', + ], + }], + ], }, ], }], diff --git a/components/policy/core/common/cloud/DEPS b/components/policy/core/common/cloud/DEPS new file mode 100644 index 0000000..458b8b5 --- /dev/null +++ b/components/policy/core/common/cloud/DEPS @@ -0,0 +1,7 @@ +# TODO(joaodasilva): remove this DEPS exception after moving chrome/app/policy +# into the component. +specific_include_rules = { + 'user_cloud_policy_store_unittest\.cc': [ + "+policy/policy_constants.h", + ], +} diff --git a/chrome/browser/policy/cloud/mock_user_cloud_policy_store.cc b/components/policy/core/common/cloud/mock_user_cloud_policy_store.cc index 0b7136d..74166ca 100644 --- a/chrome/browser/policy/cloud/mock_user_cloud_policy_store.cc +++ b/components/policy/core/common/cloud/mock_user_cloud_policy_store.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/policy/cloud/mock_user_cloud_policy_store.h" +#include "components/policy/core/common/cloud/mock_user_cloud_policy_store.h" namespace policy { diff --git a/chrome/browser/policy/cloud/mock_user_cloud_policy_store.h b/components/policy/core/common/cloud/mock_user_cloud_policy_store.h index c65e834..8fae220 100644 --- a/chrome/browser/policy/cloud/mock_user_cloud_policy_store.h +++ b/components/policy/core/common/cloud/mock_user_cloud_policy_store.h @@ -1,11 +1,11 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_POLICY_CLOUD_MOCK_USER_CLOUD_POLICY_STORE_H_ -#define CHROME_BROWSER_POLICY_CLOUD_MOCK_USER_CLOUD_POLICY_STORE_H_ +#ifndef COMPONENTS_POLICY_CORE_COMMON_CLOUD_MOCK_USER_CLOUD_POLICY_STORE_H_ +#define COMPONENTS_POLICY_CORE_COMMON_CLOUD_MOCK_USER_CLOUD_POLICY_STORE_H_ -#include "chrome/browser/policy/cloud/user_cloud_policy_store.h" +#include "components/policy/core/common/cloud/user_cloud_policy_store.h" #include "testing/gmock/include/gmock/gmock.h" namespace policy { @@ -35,4 +35,4 @@ class MockUserCloudPolicyStore : public UserCloudPolicyStore { } // namespace policy -#endif // CHROME_BROWSER_POLICY_CLOUD_MOCK_USER_CLOUD_POLICY_STORE_H_ +#endif // COMPONENTS_POLICY_CORE_COMMON_CLOUD_MOCK_USER_CLOUD_POLICY_STORE_H_ diff --git a/chrome/browser/policy/cloud/user_cloud_policy_manager.cc b/components/policy/core/common/cloud/user_cloud_policy_manager.cc index 22ac8f9..6e47339 100644 --- a/chrome/browser/policy/cloud/user_cloud_policy_manager.cc +++ b/components/policy/core/common/cloud/user_cloud_policy_manager.cc @@ -1,16 +1,16 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/policy/cloud/user_cloud_policy_manager.h" +#include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/sequenced_task_runner.h" -#include "chrome/browser/policy/cloud/user_cloud_policy_store.h" #include "components/policy/core/common/cloud/cloud_external_data_manager.h" #include "components/policy/core/common/cloud/cloud_policy_constants.h" #include "components/policy/core/common/cloud/cloud_policy_service.h" +#include "components/policy/core/common/cloud/user_cloud_policy_store.h" #include "components/policy/core/common/policy_pref_names.h" #include "components/policy/core/common/policy_types.h" #include "net/url_request/url_request_context_getter.h" diff --git a/chrome/browser/policy/cloud/user_cloud_policy_manager.h b/components/policy/core/common/cloud/user_cloud_policy_manager.h index fc93b89..5c4068e 100644 --- a/chrome/browser/policy/cloud/user_cloud_policy_manager.h +++ b/components/policy/core/common/cloud/user_cloud_policy_manager.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_POLICY_CLOUD_USER_CLOUD_POLICY_MANAGER_H_ -#define CHROME_BROWSER_POLICY_CLOUD_USER_CLOUD_POLICY_MANAGER_H_ +#ifndef COMPONENTS_POLICY_CORE_COMMON_CLOUD_USER_CLOUD_POLICY_MANAGER_H_ +#define COMPONENTS_POLICY_CORE_COMMON_CLOUD_USER_CLOUD_POLICY_MANAGER_H_ #include <string> @@ -13,6 +13,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "components/policy/core/common/cloud/cloud_policy_manager.h" +#include "components/policy/policy_export.h" class PrefService; @@ -31,7 +32,7 @@ class DeviceManagementService; class UserCloudPolicyStore; // UserCloudPolicyManager handles initialization of user policy. -class UserCloudPolicyManager : public CloudPolicyManager { +class POLICY_EXPORT UserCloudPolicyManager : public CloudPolicyManager { public: // |task_runner| is the runner for policy refresh tasks. // |file_task_runner| is used for file operations. Currently this must be @@ -93,4 +94,4 @@ class UserCloudPolicyManager : public CloudPolicyManager { } // namespace policy -#endif // CHROME_BROWSER_POLICY_CLOUD_USER_CLOUD_POLICY_MANAGER_H_ +#endif // COMPONENTS_POLICY_CORE_COMMON_CLOUD_USER_CLOUD_POLICY_MANAGER_H_ diff --git a/chrome/browser/policy/cloud/user_cloud_policy_manager_unittest.cc b/components/policy/core/common/cloud/user_cloud_policy_manager_unittest.cc index 9f1369e..0602b28 100644 --- a/chrome/browser/policy/cloud/user_cloud_policy_manager_unittest.cc +++ b/components/policy/core/common/cloud/user_cloud_policy_manager_unittest.cc @@ -1,15 +1,15 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/policy/cloud/user_cloud_policy_manager.h" +#include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #include "base/callback.h" #include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop_proxy.h" #include "base/sequenced_task_runner.h" -#include "chrome/browser/policy/cloud/mock_user_cloud_policy_store.h" #include "components/policy/core/common/cloud/cloud_external_data_manager.h" +#include "components/policy/core/common/cloud/mock_user_cloud_policy_store.h" #include "components/policy/core/common/external_data_fetcher.h" #include "components/policy/core/common/mock_configuration_policy_provider.h" #include "components/policy/core/common/schema_registry.h" diff --git a/chrome/browser/policy/cloud/user_cloud_policy_store.cc b/components/policy/core/common/cloud/user_cloud_policy_store.cc index 4bcafdab..c800328 100644 --- a/chrome/browser/policy/cloud/user_cloud_policy_store.cc +++ b/components/policy/core/common/cloud/user_cloud_policy_store.cc @@ -1,14 +1,13 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/policy/cloud/user_cloud_policy_store.h" +#include "components/policy/core/common/cloud/user_cloud_policy_store.h" #include "base/bind.h" #include "base/file_util.h" #include "base/location.h" #include "base/task_runner_util.h" -#include "policy/policy_constants.h" #include "policy/proto/cloud_policy.pb.h" #include "policy/proto/device_management_backend.pb.h" diff --git a/chrome/browser/policy/cloud/user_cloud_policy_store.h b/components/policy/core/common/cloud/user_cloud_policy_store.h index 43c26c3..4dc7e24 100644 --- a/chrome/browser/policy/cloud/user_cloud_policy_store.h +++ b/components/policy/core/common/cloud/user_cloud_policy_store.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_POLICY_CLOUD_USER_CLOUD_POLICY_STORE_H_ -#define CHROME_BROWSER_POLICY_CLOUD_USER_CLOUD_POLICY_STORE_H_ +#ifndef COMPONENTS_POLICY_CORE_COMMON_CLOUD_USER_CLOUD_POLICY_STORE_H_ +#define COMPONENTS_POLICY_CORE_COMMON_CLOUD_USER_CLOUD_POLICY_STORE_H_ #include <string> @@ -11,7 +11,8 @@ #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/memory/weak_ptr.h" -#include "chrome/browser/policy/cloud/user_cloud_policy_store_base.h" +#include "components/policy/core/common/cloud/user_cloud_policy_store_base.h" +#include "components/policy/policy_export.h" namespace base { class SequencedTaskRunner; @@ -22,7 +23,7 @@ namespace policy { // Implements a cloud policy store that is stored in a simple file in the user's // profile directory. This is used on (non-chromeos) platforms that do not have // a secure storage implementation. -class UserCloudPolicyStore : public UserCloudPolicyStoreBase { +class POLICY_EXPORT UserCloudPolicyStore : public UserCloudPolicyStoreBase { public: // Creates a policy store associated with a signed-in (or in the progress of // it) user. @@ -89,4 +90,4 @@ class UserCloudPolicyStore : public UserCloudPolicyStoreBase { } // namespace policy -#endif // CHROME_BROWSER_POLICY_CLOUD_USER_CLOUD_POLICY_STORE_H_ +#endif // COMPONENTS_POLICY_CORE_COMMON_CLOUD_USER_CLOUD_POLICY_STORE_H_ diff --git a/chrome/browser/policy/cloud/user_cloud_policy_store_base.cc b/components/policy/core/common/cloud/user_cloud_policy_store_base.cc index 478d686..de5adee 100644 --- a/chrome/browser/policy/cloud/user_cloud_policy_store_base.cc +++ b/components/policy/core/common/cloud/user_cloud_policy_store_base.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/policy/cloud/user_cloud_policy_store_base.h" +#include "components/policy/core/common/cloud/user_cloud_policy_store_base.h" #include "components/policy/core/common/cloud/cloud_external_data_manager.h" #include "components/policy/core/common/cloud/cloud_policy_constants.h" diff --git a/chrome/browser/policy/cloud/user_cloud_policy_store_base.h b/components/policy/core/common/cloud/user_cloud_policy_store_base.h index 1a1f088..1dd9743 100644 --- a/chrome/browser/policy/cloud/user_cloud_policy_store_base.h +++ b/components/policy/core/common/cloud/user_cloud_policy_store_base.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_POLICY_CLOUD_USER_CLOUD_POLICY_STORE_BASE_H_ -#define CHROME_BROWSER_POLICY_CLOUD_USER_CLOUD_POLICY_STORE_BASE_H_ +#ifndef COMPONENTS_POLICY_CORE_COMMON_CLOUD_USER_CLOUD_POLICY_STORE_BASE_H_ +#define COMPONENTS_POLICY_CORE_COMMON_CLOUD_USER_CLOUD_POLICY_STORE_BASE_H_ #include <string> @@ -13,6 +13,7 @@ #include "base/memory/weak_ptr.h" #include "components/policy/core/common/cloud/cloud_policy_store.h" #include "components/policy/core/common/cloud/cloud_policy_validator.h" +#include "components/policy/policy_export.h" namespace base { class SequencedTaskRunner; @@ -22,7 +23,7 @@ namespace policy { // Base class that implements common cross-platform UserCloudPolicyStore // functionality. -class UserCloudPolicyStoreBase : public CloudPolicyStore { +class POLICY_EXPORT UserCloudPolicyStoreBase : public CloudPolicyStore { public: explicit UserCloudPolicyStoreBase( scoped_refptr<base::SequencedTaskRunner> background_task_runner); @@ -53,4 +54,4 @@ class UserCloudPolicyStoreBase : public CloudPolicyStore { } // namespace policy -#endif // CHROME_BROWSER_POLICY_CLOUD_USER_CLOUD_POLICY_STORE_BASE_H_ +#endif // COMPONENTS_POLICY_CORE_COMMON_CLOUD_USER_CLOUD_POLICY_STORE_BASE_H_ diff --git a/chrome/browser/policy/cloud/user_cloud_policy_store_unittest.cc b/components/policy/core/common/cloud/user_cloud_policy_store_unittest.cc index 8554f35..0220251 100644 --- a/chrome/browser/policy/cloud/user_cloud_policy_store_unittest.cc +++ b/components/policy/core/common/cloud/user_cloud_policy_store_unittest.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/policy/cloud/user_cloud_policy_store.h" +#include "components/policy/core/common/cloud/user_cloud_policy_store.h" #include "base/file_util.h" #include "base/files/scoped_temp_dir.h" |