• Home
  • History
  • Annotate
  • only in /external/chromium_org/components/policy/
History log of /external/chromium_org/components/policy/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
29b820f8d84e3bc97d62552e54923c42407f2f29 12-Nov-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.59

This commit was generated by merge_to_master.py.

Change-Id: If9c0c09d8c3a3121b5e75ae9c4c446e4e4baaae6
esources/policy_templates_am.xtb
esources/policy_templates_ar.xtb
esources/policy_templates_bg.xtb
esources/policy_templates_bn.xtb
esources/policy_templates_ca.xtb
esources/policy_templates_cs.xtb
esources/policy_templates_da.xtb
esources/policy_templates_de.xtb
esources/policy_templates_el.xtb
esources/policy_templates_en-GB.xtb
esources/policy_templates_es-419.xtb
esources/policy_templates_es.xtb
esources/policy_templates_et.xtb
esources/policy_templates_fi.xtb
esources/policy_templates_fil.xtb
esources/policy_templates_fr.xtb
esources/policy_templates_gu.xtb
esources/policy_templates_hi.xtb
esources/policy_templates_hr.xtb
esources/policy_templates_hu.xtb
esources/policy_templates_id.xtb
esources/policy_templates_it.xtb
esources/policy_templates_iw.xtb
esources/policy_templates_ja.xtb
esources/policy_templates_kn.xtb
esources/policy_templates_ko.xtb
esources/policy_templates_lt.xtb
esources/policy_templates_lv.xtb
esources/policy_templates_ml.xtb
esources/policy_templates_mr.xtb
esources/policy_templates_ms.xtb
esources/policy_templates_nl.xtb
esources/policy_templates_no.xtb
esources/policy_templates_pl.xtb
esources/policy_templates_pt-BR.xtb
esources/policy_templates_pt-PT.xtb
esources/policy_templates_ro.xtb
esources/policy_templates_ru.xtb
esources/policy_templates_sk.xtb
esources/policy_templates_sl.xtb
esources/policy_templates_sr.xtb
esources/policy_templates_sv.xtb
esources/policy_templates_sw.xtb
esources/policy_templates_ta.xtb
esources/policy_templates_te.xtb
esources/policy_templates_th.xtb
esources/policy_templates_tr.xtb
esources/policy_templates_uk.xtb
esources/policy_templates_vi.xtb
esources/policy_templates_zh-CN.xtb
esources/policy_templates_zh-TW.xtb
ab8f6f0bd665d3c1ff476eb06c58c42630e462d4 29-Oct-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.44

This commit was generated by merge_to_master.py.

Change-Id: I12ecf158017b8be5f9a1d33f4152e5a3c812cb7f
esources/policy_templates.json
1675a649fd7a8b3cb80ffddae2dc181f122353c5 22-Oct-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.37

This commit was generated by merge_to_master.py.

Change-Id: I4ca18a1d6d089e98b0511ad83f49e89d62401760
ore/common/cloud/enterprise_metrics.cc
ore/common/cloud/enterprise_metrics.h
esources/policy_templates.json
34680572440d7894ef8dafce81d8039ed80726a2 14-Oct-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 39.0.2171.26

This commit was generated by merge_to_master.py.

Change-Id: I7e2a210cf0e24a4fbfd446a03aab3b29edbdd13a
esources/policy_templates_am.xtb
esources/policy_templates_ar.xtb
esources/policy_templates_bg.xtb
esources/policy_templates_bn.xtb
esources/policy_templates_ca.xtb
esources/policy_templates_cs.xtb
esources/policy_templates_da.xtb
esources/policy_templates_de.xtb
esources/policy_templates_el.xtb
esources/policy_templates_en-GB.xtb
esources/policy_templates_es-419.xtb
esources/policy_templates_es.xtb
esources/policy_templates_et.xtb
esources/policy_templates_fi.xtb
esources/policy_templates_fil.xtb
esources/policy_templates_fr.xtb
esources/policy_templates_gu.xtb
esources/policy_templates_hi.xtb
esources/policy_templates_hr.xtb
esources/policy_templates_hu.xtb
esources/policy_templates_id.xtb
esources/policy_templates_it.xtb
esources/policy_templates_iw.xtb
esources/policy_templates_ja.xtb
esources/policy_templates_kn.xtb
esources/policy_templates_ko.xtb
esources/policy_templates_lt.xtb
esources/policy_templates_lv.xtb
esources/policy_templates_ml.xtb
esources/policy_templates_mr.xtb
esources/policy_templates_ms.xtb
esources/policy_templates_nl.xtb
esources/policy_templates_no.xtb
esources/policy_templates_pl.xtb
esources/policy_templates_pt-BR.xtb
esources/policy_templates_pt-PT.xtb
esources/policy_templates_ro.xtb
esources/policy_templates_ru.xtb
esources/policy_templates_sk.xtb
esources/policy_templates_sl.xtb
esources/policy_templates_sr.xtb
esources/policy_templates_sv.xtb
esources/policy_templates_sw.xtb
esources/policy_templates_ta.xtb
esources/policy_templates_te.xtb
esources/policy_templates_th.xtb
esources/policy_templates_tr.xtb
esources/policy_templates_uk.xtb
esources/policy_templates_vi.xtb
esources/policy_templates_zh-CN.xtb
esources/policy_templates_zh-TW.xtb
1320f92c476a1ad9d19dba2a48c72b75566198e9 30-Sep-2014 Primiano Tucci <primiano@google.com> Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
UILD.gn
ore/browser/managed_bookmarks_tracker.cc
ore/browser/managed_bookmarks_tracker_unittest.cc
ore/browser/url_blacklist_manager.cc
ore/browser/url_blacklist_manager.h
ore/common/async_policy_loader.h
ore/common/async_policy_provider.h
ore/common/cloud/cloud_policy_client_registration_helper.cc
ore/common/cloud/cloud_policy_client_registration_helper.h
ore/common/cloud/cloud_policy_client_unittest.cc
ore/common/cloud/device_management_service.cc
ore/common/cloud/device_management_service.h
ore/common/cloud/device_management_service_unittest.cc
ore/common/cloud/mock_device_management_service.h
ore/common/cloud/policy_builder.cc
ore/common/cloud/policy_header_io_helper_unittest.cc
ore/common/cloud/policy_header_service_unittest.cc
ore/common/cloud/resource_cache.cc
ore/common/cloud/system_policy_request_context.cc
ore/common/cloud/user_cloud_policy_store.cc
ore/common/cloud/user_cloud_policy_store.h
ore/common/cloud/user_cloud_policy_store_unittest.cc
ore/common/cloud/user_policy_request_context.cc
ore/common/config_dir_policy_loader.cc
ore/common/config_dir_policy_loader_unittest.cc
ore/common/generate_policy_source_unittest.cc
ore/common/policy_loader_mac.cc
ore/common/policy_loader_win.cc
ore/common/policy_loader_win_unittest.cc
ore/common/schema.cc
ore/common/schema_map.cc
ore/common/schema_map_unittest.cc
ore/common/schema_registry_unittest.cc
roto/device_management_backend.proto
esources/OWNERS
esources/policy_templates.json
ools/generate_policy_source.py
03b57e008b61dfcb1fbad3aea950ae0e001748b0 28-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 291560

This commit was generated by merge_to_master.py.

Change-Id: Ic58269055810d51286b4109e59b90b6856887a30
ore/browser/url_blacklist_manager.cc
ore/common/cloud/user_cloud_policy_store.cc
ore/common/cloud/user_cloud_policy_store_unittest.cc
esources/policy_templates.json
6e8cce623b6e4fe0c9e4af605d675dd9d0338c38 19-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 290040

This commit was generated by merge_to_master.py.

Change-Id: I694ec52d1e0b553f163c2faf4373d63270ab1aac
ore/common/cloud/enterprise_metrics.cc
ore/common/cloud/enterprise_metrics.h
ore/common/preg_parser_win.cc
esources/policy_templates.json
esources/policy_templates_cs.xtb
esources/policy_templates_da.xtb
esources/policy_templates_de.xtb
esources/policy_templates_fa.xtb
esources/policy_templates_id.xtb
esources/policy_templates_zh-CN.xtb
5f1c94371a64b3196d4be9466099bb892df9b88e 12-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: I583602ff16d735199f1810565c9296e970ce2854
ore/browser/BUILD.gn
ore/browser/browser_policy_connector.cc
ore/browser/configuration_policy_handler.cc
ore/browser/configuration_policy_handler_unittest.cc
ore/browser/configuration_policy_pref_store_unittest.cc
ore/common/async_policy_provider_unittest.cc
ore/common/cloud/cloud_policy_manager_unittest.cc
ore/common/cloud/cloud_policy_validator.h
ore/common/cloud/component_cloud_policy_service_unittest.cc
ore/common/cloud/component_cloud_policy_store_unittest.cc
ore/common/cloud/component_cloud_policy_updater_unittest.cc
ore/common/cloud/enterprise_metrics.h
ore/common/cloud/system_policy_request_context.cc
ore/common/cloud/user_cloud_policy_manager_unittest.cc
ore/common/cloud/user_cloud_policy_store.cc
ore/common/configuration_policy_provider_test.cc
ore/common/forwarding_policy_provider_unittest.cc
ore/common/mac_util.cc
ore/common/policy_bundle_unittest.cc
ore/common/policy_loader_mac_unittest.cc
ore/common/policy_loader_win.cc
ore/common/policy_loader_win_unittest.cc
ore/common/policy_map_unittest.cc
ore/common/policy_provider_android_unittest.cc
ore/common/policy_service_impl_unittest.cc
ore/common/preg_parser_win.cc
ore/common/proxy_policy_provider_unittest.cc
ore/common/registry_dict_win.cc
ore/common/schema_map_unittest.cc
ore/common/schema_unittest.cc
esources/policy_templates.json
esources/policy_templates_am.xtb
esources/policy_templates_ca.xtb
esources/policy_templates_da.xtb
esources/policy_templates_de.xtb
esources/policy_templates_fi.xtb
esources/policy_templates_hi.xtb
esources/policy_templates_kn.xtb
esources/policy_templates_no.xtb
esources/policy_templates_pt-BR.xtb
esources/policy_templates_ro.xtb
esources/policy_templates_sk.xtb
esources/policy_templates_th.xtb
esources/policy_templates_vi.xtb
ools/generate_policy_source.py
116680a4aac90f2aa7413d9095a592090648e557 21-Jul-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 284076

This commit was generated by merge_to_master.py.

Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
UILD.gn
ore/browser/BUILD.gn
ore/browser/autofill_policy_handler.cc
ore/browser/autofill_policy_handler_unittest.cc
ore/browser/browser_policy_connector.cc
ore/browser/configuration_policy_handler_unittest.cc
ore/browser/configuration_policy_pref_store_unittest.cc
ore/browser/url_blacklist_policy_handler_unittest.cc
ore/common/BUILD.gn
ore/common/cloud/cloud_policy_client_registration_helper.cc
ore/common/cloud/cloud_policy_constants.h
ore/common/cloud/cloud_policy_manager_unittest.cc
ore/common/cloud/cloud_policy_refresh_scheduler.cc
ore/common/cloud/cloud_policy_refresh_scheduler.h
ore/common/cloud/cloud_policy_refresh_scheduler_unittest.cc
ore/common/cloud/component_cloud_policy_service.cc
ore/common/cloud/component_cloud_policy_service.h
ore/common/cloud/component_cloud_policy_service_unittest.cc
ore/common/cloud/enterprise_metrics.cc
ore/common/cloud/enterprise_metrics.h
ore/common/cloud/rate_limiter.cc
ore/common/cloud/rate_limiter.h
ore/common/cloud/rate_limiter_unittest.cc
ore/common/cloud/user_info_fetcher.cc
ore/common/cloud/user_info_fetcher.h
ore/common/cloud/user_info_fetcher_unittest.cc
ore/common/forwarding_policy_provider_unittest.cc
ore/common/mac_util.cc
ore/common/policy_bundle_unittest.cc
ore/common/policy_load_status.h
ore/common/policy_loader_win.cc
ore/common/policy_map_unittest.cc
ore/common/policy_service_impl_unittest.cc
ore/common/policy_statistics_collector_unittest.cc
ore/common/preg_parser_win.cc
ore/common/registry_dict_win.cc
ore/common/registry_dict_win_unittest.cc
ore/common/schema_map.cc
ore/common/schema_map_unittest.cc
ore/common/schema_registry.cc
ore/common/schema_registry_unittest.cc
olicy_browser.gypi
olicy_common.gypi
roto/BUILD.gn
esources/OWNERS
esources/policy_templates.json
esources/policy_templates_am.xtb
esources/policy_templates_ar.xtb
esources/policy_templates_bg.xtb
esources/policy_templates_bn.xtb
esources/policy_templates_ca.xtb
esources/policy_templates_cs.xtb
esources/policy_templates_da.xtb
esources/policy_templates_de.xtb
esources/policy_templates_el.xtb
esources/policy_templates_en-GB.xtb
esources/policy_templates_es-419.xtb
esources/policy_templates_es.xtb
esources/policy_templates_et.xtb
esources/policy_templates_fa.xtb
esources/policy_templates_fi.xtb
esources/policy_templates_fil.xtb
esources/policy_templates_fr.xtb
esources/policy_templates_gu.xtb
esources/policy_templates_hi.xtb
esources/policy_templates_hr.xtb
esources/policy_templates_hu.xtb
esources/policy_templates_id.xtb
esources/policy_templates_it.xtb
esources/policy_templates_iw.xtb
esources/policy_templates_ja.xtb
esources/policy_templates_kn.xtb
esources/policy_templates_ko.xtb
esources/policy_templates_lt.xtb
esources/policy_templates_lv.xtb
esources/policy_templates_ml.xtb
esources/policy_templates_mr.xtb
esources/policy_templates_ms.xtb
esources/policy_templates_nl.xtb
esources/policy_templates_no.xtb
esources/policy_templates_pl.xtb
esources/policy_templates_pt-BR.xtb
esources/policy_templates_pt-PT.xtb
esources/policy_templates_ro.xtb
esources/policy_templates_ru.xtb
esources/policy_templates_sk.xtb
esources/policy_templates_sl.xtb
esources/policy_templates_sr.xtb
esources/policy_templates_sv.xtb
esources/policy_templates_sw.xtb
esources/policy_templates_ta.xtb
esources/policy_templates_te.xtb
esources/policy_templates_th.xtb
esources/policy_templates_tr.xtb
esources/policy_templates_uk.xtb
esources/policy_templates_vi.xtb
esources/policy_templates_zh-CN.xtb
esources/policy_templates_zh-TW.xtb
ools/generate_policy_source.py
ools/syntax_check_policy_template_json.py
6d86b77056ed63eb6871182f42a9fd5f07550f90 25-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278856

This commit was generated by merge_to_master.py.

Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3
ore/common/schema_registry.cc
ore/common/schema_registry.h
ore/common/schema_registry_unittest.cc
esources/policy_templates.json
f8ee788a64d60abd8f2d742a5fdedde054ecd910 20-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
ore/browser/configuration_policy_handler.cc
ore/browser/configuration_policy_handler.h
ore/browser/configuration_policy_handler_unittest.cc
ore/browser/managed_bookmarks_tracker_unittest.cc
ore/browser/url_blacklist_manager.h
ore/common/cloud/cloud_policy_constants.cc
ore/common/policy_loader_ios.mm
ore/common/policy_provider_android.cc
ore/common/policy_provider_android.h
olicy_browser.gypi
esources/policy_templates.json
esources/policy_templates_am.xtb
esources/policy_templates_ar.xtb
esources/policy_templates_bg.xtb
esources/policy_templates_bn.xtb
esources/policy_templates_ca.xtb
esources/policy_templates_cs.xtb
esources/policy_templates_da.xtb
esources/policy_templates_de.xtb
esources/policy_templates_el.xtb
esources/policy_templates_en-GB.xtb
esources/policy_templates_es-419.xtb
esources/policy_templates_es.xtb
esources/policy_templates_et.xtb
esources/policy_templates_fa.xtb
esources/policy_templates_fi.xtb
esources/policy_templates_fil.xtb
esources/policy_templates_fr.xtb
esources/policy_templates_gu.xtb
esources/policy_templates_hi.xtb
esources/policy_templates_hr.xtb
esources/policy_templates_hu.xtb
esources/policy_templates_id.xtb
esources/policy_templates_it.xtb
esources/policy_templates_iw.xtb
esources/policy_templates_ja.xtb
esources/policy_templates_kn.xtb
esources/policy_templates_ko.xtb
esources/policy_templates_lt.xtb
esources/policy_templates_lv.xtb
esources/policy_templates_ml.xtb
esources/policy_templates_mr.xtb
esources/policy_templates_ms.xtb
esources/policy_templates_nl.xtb
esources/policy_templates_no.xtb
esources/policy_templates_pl.xtb
esources/policy_templates_pt-BR.xtb
esources/policy_templates_pt-PT.xtb
esources/policy_templates_ro.xtb
esources/policy_templates_ru.xtb
esources/policy_templates_sk.xtb
esources/policy_templates_sl.xtb
esources/policy_templates_sr.xtb
esources/policy_templates_sv.xtb
esources/policy_templates_sw.xtb
esources/policy_templates_ta.xtb
esources/policy_templates_te.xtb
esources/policy_templates_th.xtb
esources/policy_templates_tr.xtb
esources/policy_templates_uk.xtb
esources/policy_templates_vi.xtb
esources/policy_templates_zh-CN.xtb
esources/policy_templates_zh-TW.xtb
46d4c2bc3267f3f028f39e7e311b0f89aba2e4fd 09-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 275586

This commit was generated by merge_to_master.py.

Change-Id: Ief3a0ffd810858bfddbe0ec5931e3ee90d53f78c
ore/browser/DEPS
ore/browser/browser_policy_connector.cc
ore/browser/managed_bookmarks_tracker.cc
ore/browser/managed_bookmarks_tracker.h
ore/browser/managed_bookmarks_tracker_unittest.cc
ore/common/cloud/cloud_policy_constants.cc
ore/common/cloud/cloud_policy_constants.h
ore/common/cloud/cloud_policy_manager.cc
ore/common/cloud/policy_header_io_helper.cc
ore/common/cloud/policy_header_io_helper.h
ore/common/cloud/policy_header_io_helper_unittest.cc
ore/common/cloud/policy_header_service.cc
ore/common/cloud/policy_header_service.h
ore/common/cloud/policy_header_service_unittest.cc
ore/common/policy_switches.cc
ore/common/policy_switches.h
olicy_browser.gypi
esources/policy_templates.json
ools/generate_policy_source.py
cedac228d2dd51db4b79ea1e72c7f249408ee061 03-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 273901

This commit was generated by merge_to_master.py.

Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
ore/browser/DEPS
ore/browser/cloud/message_util.cc
ore/browser/configuration_policy_handler.cc
ore/browser/configuration_policy_handler_list.cc
ore/browser/policy_error_map.cc
ore/browser/url_blacklist_manager.cc
ore/browser/url_blacklist_policy_handler.cc
ore/common/config_dir_policy_loader.cc
ore/common/policy_loader_mac.cc
ore/common/policy_loader_win.cc
olicy_browser.gypi
olicy_common.gypi
roto/device_management_backend.proto
esources/policy_templates.json
esources/policy_templates_am.xtb
esources/policy_templates_ar.xtb
esources/policy_templates_bg.xtb
esources/policy_templates_bn.xtb
esources/policy_templates_ca.xtb
esources/policy_templates_cs.xtb
esources/policy_templates_da.xtb
esources/policy_templates_de.xtb
esources/policy_templates_el.xtb
esources/policy_templates_en-GB.xtb
esources/policy_templates_es-419.xtb
esources/policy_templates_es.xtb
esources/policy_templates_et.xtb
esources/policy_templates_fa.xtb
esources/policy_templates_fi.xtb
esources/policy_templates_fil.xtb
esources/policy_templates_fr.xtb
esources/policy_templates_gu.xtb
esources/policy_templates_hi.xtb
esources/policy_templates_hr.xtb
esources/policy_templates_hu.xtb
esources/policy_templates_id.xtb
esources/policy_templates_it.xtb
esources/policy_templates_iw.xtb
esources/policy_templates_ja.xtb
esources/policy_templates_kn.xtb
esources/policy_templates_ko.xtb
esources/policy_templates_lt.xtb
esources/policy_templates_lv.xtb
esources/policy_templates_ml.xtb
esources/policy_templates_mr.xtb
esources/policy_templates_ms.xtb
esources/policy_templates_nl.xtb
esources/policy_templates_no.xtb
esources/policy_templates_pl.xtb
esources/policy_templates_pt-BR.xtb
esources/policy_templates_pt-PT.xtb
esources/policy_templates_ro.xtb
esources/policy_templates_ru.xtb
esources/policy_templates_sk.xtb
esources/policy_templates_sl.xtb
esources/policy_templates_sr.xtb
esources/policy_templates_sv.xtb
esources/policy_templates_sw.xtb
esources/policy_templates_ta.xtb
esources/policy_templates_te.xtb
esources/policy_templates_th.xtb
esources/policy_templates_tr.xtb
esources/policy_templates_uk.xtb
esources/policy_templates_vi.xtb
esources/policy_templates_zh-CN.xtb
esources/policy_templates_zh-TW.xtb
010d83a9304c5a91596085d917d248abff47903a 14-May-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 269336

This commit was generated by merge_to_master.py.

Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
ore/browser/url_blacklist_manager.cc
ore/browser/url_blacklist_manager.h
ore/common/schema_registry_unittest.cc
olicy_proto_export.h
esources/PRESUBMIT.py
esources/policy_templates.json
esources/policy_templates_am.xtb
esources/policy_templates_lt.xtb
esources/policy_templates_sr.xtb
esources/policy_templates_sw.xtb
esources/policy_templates_th.xtb
5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1 01-May-2014 Bo Liu <boliu@google.com> Merge from Chromium at DEPS revision 267519

This commit was generated by merge_to_master.py.

Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25
ore/common/cloud/cloud_policy_client_registration_helper.cc
ore/common/cloud/cloud_policy_client_registration_helper.h
ore/common/cloud/component_cloud_policy_service.cc
ore/common/cloud/component_cloud_policy_service.h
ore/common/cloud/component_cloud_policy_service_unittest.cc
ore/common/cloud/resource_cache.cc
ore/common/cloud/user_info_fetcher.cc
ore/common/cloud/user_info_fetcher.h
ore/common/cloud/user_info_fetcher_unittest.cc
ore/common/policy_switches.cc
esources/PRESUBMIT.py
esources/policy_templates.json
ools/syntax_check_policy_template_json.py
0529e5d033099cbfc42635f6f6183833b09dff6e 24-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 265802

This commit was generated by merge_to_master.py.

Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
ore/common/cloud/cloud_policy_manager.cc
ore/common/cloud/cloud_policy_manager.h
roto/device_management_backend.proto
esources/policy_templates.json
esources/policy_templates_sw.xtb
esources/policy_templates_th.xtb
a02191e04bc25c4935f804f2c080ae28663d096d 16-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 263965

This commit was generated by merge_to_master.py.

Change-Id: Ia1121eddd985123f160afde6372525c3d25975bf
ore/browser/url_blacklist_manager.cc
ore/browser/url_blacklist_manager.h
c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c 10-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 262940

This commit was generated by merge_to_master.py.

Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
ore/DEPS
ore/browser/url_blacklist_manager.cc
ore/browser/url_blacklist_manager.h
ore/common/cloud/enterprise_metrics.h
ore/common/generate_policy_source_unittest.cc
ore/common/schema.cc
ore/common/schema.h
ore/common/schema_internal.h
ore/common/schema_unittest.cc
olicy_common.gypi
esources/policy_templates.grd
esources/policy_templates.json
esources/policy_templates_ca.xtb
esources/policy_templates_da.xtb
esources/policy_templates_fa.xtb
esources/policy_templates_fr.xtb
esources/policy_templates_hi.xtb
esources/policy_templates_hr.xtb
esources/policy_templates_id.xtb
esources/policy_templates_it.xtb
esources/policy_templates_iw.xtb
esources/policy_templates_kn.xtb
esources/policy_templates_ml.xtb
esources/policy_templates_mr.xtb
esources/policy_templates_ms.xtb
esources/policy_templates_no.xtb
esources/policy_templates_ro.xtb
esources/policy_templates_sk.xtb
esources/policy_templates_sl.xtb
esources/policy_templates_sr.xtb
esources/policy_templates_sw.xtb
esources/policy_templates_ta.xtb
esources/policy_templates_te.xtb
esources/policy_templates_th.xtb
esources/policy_templates_uk.xtb
esources/policy_templates_vi.xtb
esources/policy_templates_zh-CN.xtb
esources/policy_templates_zh-TW.xtb
ools/generate_policy_source.py
ools/syntax_check_policy_template_json.py
e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d 03-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 261286

This commit was generated by merge_to_master.py.

Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89
ore/common/cloud/cloud_policy_refresh_scheduler.cc
ore/common/cloud/cloud_policy_refresh_scheduler.h
ore/common/cloud/cloud_policy_refresh_scheduler_unittest.cc
esources/policy_templates_am.xtb
esources/policy_templates_ar.xtb
esources/policy_templates_bg.xtb
esources/policy_templates_bn.xtb
esources/policy_templates_ca.xtb
esources/policy_templates_cs.xtb
esources/policy_templates_da.xtb
esources/policy_templates_de.xtb
esources/policy_templates_el.xtb
esources/policy_templates_en-GB.xtb
esources/policy_templates_es-419.xtb
esources/policy_templates_es.xtb
esources/policy_templates_et.xtb
esources/policy_templates_fa.xtb
esources/policy_templates_fi.xtb
esources/policy_templates_fil.xtb
esources/policy_templates_fr.xtb
esources/policy_templates_gu.xtb
esources/policy_templates_hi.xtb
esources/policy_templates_hr.xtb
esources/policy_templates_hu.xtb
esources/policy_templates_id.xtb
esources/policy_templates_it.xtb
esources/policy_templates_iw.xtb
esources/policy_templates_ja.xtb
esources/policy_templates_kn.xtb
esources/policy_templates_ko.xtb
esources/policy_templates_lt.xtb
esources/policy_templates_lv.xtb
esources/policy_templates_ml.xtb
esources/policy_templates_mr.xtb
esources/policy_templates_ms.xtb
esources/policy_templates_nl.xtb
esources/policy_templates_no.xtb
esources/policy_templates_pl.xtb
esources/policy_templates_pt-BR.xtb
esources/policy_templates_pt-PT.xtb
esources/policy_templates_ro.xtb
esources/policy_templates_ru.xtb
esources/policy_templates_sk.xtb
esources/policy_templates_sl.xtb
esources/policy_templates_sr.xtb
esources/policy_templates_sv.xtb
esources/policy_templates_sw.xtb
esources/policy_templates_ta.xtb
esources/policy_templates_te.xtb
esources/policy_templates_th.xtb
esources/policy_templates_tr.xtb
esources/policy_templates_uk.xtb
esources/policy_templates_vi.xtb
esources/policy_templates_zh-CN.xtb
esources/policy_templates_zh-TW.xtb
4ad1aa43a48567659193a298fad74f55e00b3dd9 01-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 260540

This commit was generated by merge_to_master.py.

Change-Id: I10b8e4931992bb84eb4da800a337bbd0a52f6588
ore/common/policy_loader_ios_unittest.mm
effb81e5f8246d0db0270817048dc992db66e9fb 31-Mar-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 260458

This commit was generated by merge_to_master.py.

Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
ore/browser/cloud/message_util.cc
ore/browser/configuration_policy_pref_store_unittest.cc
ore/browser/url_blacklist_manager.cc
ore/browser/url_blacklist_manager.h
ore/common/cloud/cloud_policy_client.cc
ore/common/cloud/cloud_policy_client.h
ore/common/cloud/cloud_policy_client_registration_helper.cc
ore/common/cloud/cloud_policy_client_unittest.cc
ore/common/cloud/cloud_policy_constants.h
ore/common/cloud/cloud_policy_refresh_scheduler.cc
ore/common/cloud/device_management_service.cc
ore/common/cloud/enterprise_metrics.h
ore/common/cloud/mock_cloud_policy_client.h
ore/common/policy_loader_ios.h
ore/common/policy_loader_ios.mm
ore/common/policy_loader_ios_unittest.mm
ore/common/policy_switches.cc
ore/common/policy_switches.h
roto/device_management_backend.proto
esources/policy_templates.json
esources/policy_templates_am.xtb
esources/policy_templates_de.xtb
esources/policy_templates_lt.xtb
23730a6e56a168d1879203e4b3819bb36e3d8f1f 21-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 258528

This commit was generated by merge_to_master.py.

Change-Id: Id197cbdde2c2881915f096c0426c741416884783
ore/common/cloud/cloud_policy_constants.cc
ore/common/cloud/cloud_policy_validator_unittest.cc
ore/common/cloud/user_cloud_policy_store_unittest.cc
ore/common/policy_switches.cc
ore/common/policy_switches.h
olicy_browser.gypi
a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 18-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 257591

This commit was generated by merge_to_master.py.

Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
ore/browser/browser_policy_connector_ios.h
ore/browser/browser_policy_connector_ios.mm
ore/browser/configuration_policy_handler.cc
ore/browser/configuration_policy_handler.h
ore/browser/configuration_policy_handler_list.cc
ore/browser/configuration_policy_handler_list.h
ore/browser/configuration_policy_handler_parameters.h
ore/browser/configuration_policy_handler_unittest.cc
ore/browser/configuration_policy_pref_store_test.cc
ore/browser/configuration_policy_pref_store_test.h
ore/browser/configuration_policy_pref_store_unittest.cc
ore/browser/url_blacklist_manager.cc
ore/browser/url_blacklist_manager.h
ore/browser/url_blacklist_policy_handler_unittest.cc
ore/common/cloud/cloud_policy_client.cc
ore/common/cloud/cloud_policy_client.h
ore/common/cloud/cloud_policy_client_registration_helper.cc
ore/common/cloud/cloud_policy_client_registration_helper.h
ore/common/cloud/cloud_policy_constants.cc
ore/common/cloud/cloud_policy_constants.h
ore/common/cloud/cloud_policy_validator.cc
ore/common/cloud/cloud_policy_validator.h
ore/common/cloud/cloud_policy_validator_unittest.cc
ore/common/cloud/component_cloud_policy_store.cc
ore/common/cloud/device_management_service.cc
ore/common/cloud/device_management_service.h
ore/common/cloud/policy_header_service.cc
ore/common/cloud/resource_cache.cc
ore/common/cloud/system_policy_request_context.cc
ore/common/cloud/user_cloud_policy_store.cc
ore/common/cloud/user_cloud_policy_store_unittest.cc
ore/common/config_dir_policy_loader_unittest.cc
ore/common/mac_util.cc
ore/common/mac_util.h
ore/common/mac_util_unittest.cc
ore/common/policy_loader_ios.h
ore/common/policy_loader_ios.mm
ore/common/policy_loader_ios_unittest.mm
ore/common/policy_loader_mac.cc
ore/common/policy_loader_mac.h
ore/common/policy_loader_mac_unittest.cc
ore/common/policy_loader_win.cc
ore/common/policy_loader_win_unittest.cc
ore/common/policy_test_utils.cc
ore/common/policy_test_utils.h
ore/common/schema.cc
ore/common/schema.h
ore/common/schema_unittest.cc
olicy_browser.gypi
olicy_common.gypi
roto/device_management_backend.proto
esources/policy_templates.json
esources/policy_templates_am.xtb
esources/policy_templates_ar.xtb
esources/policy_templates_bg.xtb
esources/policy_templates_bn.xtb
esources/policy_templates_ca.xtb
esources/policy_templates_cs.xtb
esources/policy_templates_da.xtb
esources/policy_templates_de.xtb
esources/policy_templates_el.xtb
esources/policy_templates_en-GB.xtb
esources/policy_templates_es-419.xtb
esources/policy_templates_es.xtb
esources/policy_templates_et.xtb
esources/policy_templates_fa.xtb
esources/policy_templates_fi.xtb
esources/policy_templates_fil.xtb
esources/policy_templates_fr.xtb
esources/policy_templates_gu.xtb
esources/policy_templates_hi.xtb
esources/policy_templates_hr.xtb
esources/policy_templates_hu.xtb
esources/policy_templates_id.xtb
esources/policy_templates_it.xtb
esources/policy_templates_iw.xtb
esources/policy_templates_ja.xtb
esources/policy_templates_kn.xtb
esources/policy_templates_ko.xtb
esources/policy_templates_lt.xtb
esources/policy_templates_lv.xtb
esources/policy_templates_ml.xtb
esources/policy_templates_mr.xtb
esources/policy_templates_ms.xtb
esources/policy_templates_nl.xtb
esources/policy_templates_no.xtb
esources/policy_templates_pl.xtb
esources/policy_templates_pt-BR.xtb
esources/policy_templates_pt-PT.xtb
esources/policy_templates_ro.xtb
esources/policy_templates_ru.xtb
esources/policy_templates_sk.xtb
esources/policy_templates_sl.xtb
esources/policy_templates_sr.xtb
esources/policy_templates_sv.xtb
esources/policy_templates_sw.xtb
esources/policy_templates_ta.xtb
esources/policy_templates_te.xtb
esources/policy_templates_th.xtb
esources/policy_templates_tr.xtb
esources/policy_templates_uk.xtb
esources/policy_templates_vi.xtb
esources/policy_templates_zh-CN.xtb
esources/policy_templates_zh-TW.xtb
5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 21-Feb-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 251904

This commit was generated by merge_to_master.py.

Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
ore/DEPS
ore/browser/DEPS
ore/browser/autofill_policy_handler.cc
ore/browser/autofill_policy_handler.h
ore/browser/autofill_policy_handler_unittest.cc
ore/browser/browser_policy_connector.cc
ore/browser/browser_policy_connector.h
ore/browser/browser_policy_connector_ios.h
ore/browser/browser_policy_connector_ios.mm
ore/browser/browser_policy_connector_unittest.cc
ore/browser/cloud/message_util.cc
ore/browser/cloud/message_util.h
ore/browser/configuration_policy_handler.cc
ore/browser/configuration_policy_handler.h
ore/browser/configuration_policy_handler_list.h
ore/browser/configuration_policy_handler_unittest.cc
ore/browser/configuration_policy_pref_store.cc
ore/browser/configuration_policy_pref_store.h
ore/browser/policy_error_map.cc
ore/browser/policy_error_map.h
ore/browser/policy_header_io_helper.cc
ore/browser/policy_header_io_helper.h
ore/browser/policy_header_io_helper_unittest.cc
ore/browser/url_blacklist_manager.cc
ore/browser/url_blacklist_manager.h
ore/browser/url_blacklist_policy_handler.cc
ore/browser/url_blacklist_policy_handler.h
ore/common/cloud/cloud_policy_client.cc
ore/common/cloud/cloud_policy_client.h
ore/common/cloud/cloud_policy_client_registration_helper.cc
ore/common/cloud/cloud_policy_client_unittest.cc
ore/common/cloud/cloud_policy_constants.cc
ore/common/cloud/cloud_policy_constants.h
ore/common/cloud/cloud_policy_refresh_scheduler.cc
ore/common/cloud/cloud_policy_refresh_scheduler_unittest.cc
ore/common/cloud/cloud_policy_validator.cc
ore/common/cloud/cloud_policy_validator.h
ore/common/cloud/cloud_policy_validator_unittest.cc
ore/common/cloud/component_cloud_policy_service_unittest.cc
ore/common/cloud/component_cloud_policy_store.cc
ore/common/cloud/component_cloud_policy_store_unittest.cc
ore/common/cloud/component_cloud_policy_updater_unittest.cc
ore/common/cloud/device_management_service.cc
ore/common/cloud/enterprise_metrics.h
ore/common/cloud/external_policy_data_updater.cc
ore/common/cloud/external_policy_data_updater_unittest.cc
ore/common/cloud/mock_cloud_policy_client.cc
ore/common/cloud/mock_user_cloud_policy_store.cc
ore/common/cloud/mock_user_cloud_policy_store.h
ore/common/cloud/policy_builder.cc
ore/common/cloud/policy_builder.h
ore/common/cloud/policy_header_io_helper.cc
ore/common/cloud/policy_header_io_helper.h
ore/common/cloud/policy_header_io_helper_unittest.cc
ore/common/cloud/policy_header_service.cc
ore/common/cloud/policy_header_service.h
ore/common/cloud/policy_header_service_unittest.cc
ore/common/cloud/resource_cache.cc
ore/common/cloud/user_cloud_policy_manager.cc
ore/common/cloud/user_cloud_policy_manager.h
ore/common/cloud/user_cloud_policy_manager_unittest.cc
ore/common/cloud/user_cloud_policy_store.cc
ore/common/cloud/user_cloud_policy_store.h
ore/common/cloud/user_cloud_policy_store_base.cc
ore/common/cloud/user_cloud_policy_store_base.h
ore/common/cloud/user_cloud_policy_store_unittest.cc
ore/common/cloud/user_info_fetcher_unittest.cc
ore/common/config_dir_policy_loader.cc
ore/common/generate_policy_source_unittest.cc
ore/common/policy_loader_mac.cc
ore/common/policy_loader_win.cc
ore/common/policy_loader_win.h
ore/common/policy_loader_win_unittest.cc
ore/common/policy_map.cc
ore/common/policy_map.h
ore/common/policy_map_unittest.cc
ore/common/policy_pref_names.cc
ore/common/policy_pref_names.h
ore/common/policy_provider_android.cc
ore/common/policy_provider_android.h
ore/common/policy_provider_android_delegate.h
ore/common/policy_provider_android_unittest.cc
ore/common/policy_service.cc
ore/common/policy_service.h
ore/common/policy_service_impl.cc
ore/common/policy_service_impl.h
ore/common/policy_service_impl_unittest.cc
ore/common/policy_switches.cc
ore/common/policy_switches.h
ore/common/preg_parser_win.cc
ore/common/preg_parser_win.h
ore/common/proxy_policy_provider.cc
ore/common/proxy_policy_provider.h
ore/common/proxy_policy_provider_unittest.cc
ore/common/registry_dict_win.cc
ore/common/schema.cc
ore/common/schema.h
ore/common/schema_internal.h
ore/common/schema_map.cc
ore/common/schema_unittest.cc
olicy_browser.gypi
olicy_common.gypi
olicy_export.h
roto/PRESUBMIT.py
roto/device_management_backend.proto
roto/policy_signing_key.proto
esources/OWNERS
esources/PRESUBMIT.py
esources/policy_templates.grd
esources/policy_templates.json
esources/policy_templates_am.xtb
esources/policy_templates_ar.xtb
esources/policy_templates_bg.xtb
esources/policy_templates_bn.xtb
esources/policy_templates_ca.xtb
esources/policy_templates_cs.xtb
esources/policy_templates_da.xtb
esources/policy_templates_de.xtb
esources/policy_templates_el.xtb
esources/policy_templates_en-GB.xtb
esources/policy_templates_es-419.xtb
esources/policy_templates_es.xtb
esources/policy_templates_et.xtb
esources/policy_templates_fa.xtb
esources/policy_templates_fi.xtb
esources/policy_templates_fil.xtb
esources/policy_templates_fr.xtb
esources/policy_templates_gu.xtb
esources/policy_templates_hi.xtb
esources/policy_templates_hr.xtb
esources/policy_templates_hu.xtb
esources/policy_templates_id.xtb
esources/policy_templates_it.xtb
esources/policy_templates_iw.xtb
esources/policy_templates_ja.xtb
esources/policy_templates_kn.xtb
esources/policy_templates_ko.xtb
esources/policy_templates_lt.xtb
esources/policy_templates_lv.xtb
esources/policy_templates_ml.xtb
esources/policy_templates_mr.xtb
esources/policy_templates_ms.xtb
esources/policy_templates_nl.xtb
esources/policy_templates_no.xtb
esources/policy_templates_pl.xtb
esources/policy_templates_pt-BR.xtb
esources/policy_templates_pt-PT.xtb
esources/policy_templates_ro.xtb
esources/policy_templates_ru.xtb
esources/policy_templates_sk.xtb
esources/policy_templates_sl.xtb
esources/policy_templates_sr.xtb
esources/policy_templates_sv.xtb
esources/policy_templates_sw.xtb
esources/policy_templates_ta.xtb
esources/policy_templates_te.xtb
esources/policy_templates_th.xtb
esources/policy_templates_tr.xtb
esources/policy_templates_uk.xtb
esources/policy_templates_vi.xtb
esources/policy_templates_zh-CN.xtb
esources/policy_templates_zh-TW.xtb
ools/generate_policy_source.py
ools/make_policy_zip.py
ools/syntax_check_policy_template_json.py
a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 18-Dec-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 240154

This commit was generated by merge_to_master.py.

Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
ore/DEPS
ore/browser/DEPS
ore/browser/cloud/message_util.cc
ore/browser/cloud/message_util.h
ore/browser/configuration_policy_handler.cc
ore/browser/configuration_policy_handler.h
ore/browser/configuration_policy_handler_list.cc
ore/browser/configuration_policy_handler_list.h
ore/browser/configuration_policy_pref_store.cc
ore/browser/configuration_policy_pref_store.h
ore/browser/policy_error_map.cc
ore/browser/policy_error_map.h
ore/browser/policy_header_io_helper.cc
ore/browser/policy_header_io_helper.h
ore/browser/policy_header_io_helper_unittest.cc
ore/common/DEPS
ore/common/async_policy_loader.cc
ore/common/async_policy_loader.h
ore/common/async_policy_provider.cc
ore/common/async_policy_provider.h
ore/common/async_policy_provider_unittest.cc
ore/common/cloud/cloud_external_data_manager.cc
ore/common/cloud/cloud_external_data_manager.h
ore/common/cloud/cloud_policy_client.cc
ore/common/cloud/cloud_policy_client.h
ore/common/cloud/cloud_policy_client_registration_helper.cc
ore/common/cloud/cloud_policy_client_registration_helper.h
ore/common/cloud/cloud_policy_client_unittest.cc
ore/common/cloud/cloud_policy_constants.cc
ore/common/cloud/cloud_policy_constants.h
ore/common/cloud/cloud_policy_core.cc
ore/common/cloud/cloud_policy_core.h
ore/common/cloud/cloud_policy_core_unittest.cc
ore/common/cloud/cloud_policy_manager.cc
ore/common/cloud/cloud_policy_manager.h
ore/common/cloud/cloud_policy_manager_unittest.cc
ore/common/cloud/cloud_policy_refresh_scheduler.cc
ore/common/cloud/cloud_policy_refresh_scheduler.h
ore/common/cloud/cloud_policy_refresh_scheduler_unittest.cc
ore/common/cloud/cloud_policy_service.cc
ore/common/cloud/cloud_policy_service.h
ore/common/cloud/cloud_policy_service_unittest.cc
ore/common/cloud/cloud_policy_store.cc
ore/common/cloud/cloud_policy_store.h
ore/common/cloud/cloud_policy_validator.cc
ore/common/cloud/cloud_policy_validator.h
ore/common/cloud/cloud_policy_validator_unittest.cc
ore/common/cloud/component_cloud_policy_service.cc
ore/common/cloud/component_cloud_policy_service.h
ore/common/cloud/component_cloud_policy_service_stub.cc
ore/common/cloud/component_cloud_policy_service_unittest.cc
ore/common/cloud/component_cloud_policy_store.cc
ore/common/cloud/component_cloud_policy_store.h
ore/common/cloud/component_cloud_policy_store_unittest.cc
ore/common/cloud/component_cloud_policy_updater.cc
ore/common/cloud/component_cloud_policy_updater.h
ore/common/cloud/component_cloud_policy_updater_unittest.cc
ore/common/cloud/device_management_service.cc
ore/common/cloud/device_management_service.h
ore/common/cloud/device_management_service_unittest.cc
ore/common/cloud/enterprise_metrics.cc
ore/common/cloud/enterprise_metrics.h
ore/common/cloud/external_policy_data_fetcher.cc
ore/common/cloud/external_policy_data_fetcher.h
ore/common/cloud/external_policy_data_fetcher_unittest.cc
ore/common/cloud/external_policy_data_updater.cc
ore/common/cloud/external_policy_data_updater.h
ore/common/cloud/external_policy_data_updater_unittest.cc
ore/common/cloud/mock_cloud_external_data_manager.cc
ore/common/cloud/mock_cloud_external_data_manager.h
ore/common/cloud/mock_cloud_policy_client.cc
ore/common/cloud/mock_cloud_policy_client.h
ore/common/cloud/mock_cloud_policy_store.cc
ore/common/cloud/mock_cloud_policy_store.h
ore/common/cloud/mock_device_management_service.cc
ore/common/cloud/mock_device_management_service.h
ore/common/cloud/policy_builder.cc
ore/common/cloud/policy_builder.h
ore/common/cloud/rate_limiter.cc
ore/common/cloud/rate_limiter.h
ore/common/cloud/rate_limiter_unittest.cc
ore/common/cloud/resource_cache.cc
ore/common/cloud/resource_cache.h
ore/common/cloud/resource_cache_unittest.cc
ore/common/cloud/system_policy_request_context.cc
ore/common/cloud/system_policy_request_context.h
ore/common/cloud/user_info_fetcher.cc
ore/common/cloud/user_info_fetcher.h
ore/common/cloud/user_info_fetcher_unittest.cc
ore/common/cloud/user_policy_request_context.cc
ore/common/cloud/user_policy_request_context.h
ore/common/config_dir_policy_loader.cc
ore/common/config_dir_policy_loader.h
ore/common/config_dir_policy_loader_unittest.cc
ore/common/configuration_policy_provider.cc
ore/common/configuration_policy_provider.h
ore/common/configuration_policy_provider_test.cc
ore/common/configuration_policy_provider_test.h
ore/common/forwarding_policy_provider.cc
ore/common/forwarding_policy_provider.h
ore/common/forwarding_policy_provider_unittest.cc
ore/common/mock_configuration_policy_provider.cc
ore/common/mock_configuration_policy_provider.h
ore/common/mock_policy_service.cc
ore/common/mock_policy_service.h
ore/common/policy_load_status.cc
ore/common/policy_load_status.h
ore/common/policy_loader_mac.cc
ore/common/policy_loader_mac.h
ore/common/policy_loader_mac_unittest.cc
ore/common/policy_loader_win.cc
ore/common/policy_loader_win.h
ore/common/policy_loader_win_unittest.cc
ore/common/policy_map.cc
ore/common/policy_map.h
ore/common/policy_service.cc
ore/common/policy_service.h
ore/common/policy_service_impl.cc
ore/common/policy_service_impl.h
ore/common/policy_service_impl_unittest.cc
ore/common/policy_service_stub.cc
ore/common/policy_service_stub.h
ore/common/policy_statistics_collector.cc
ore/common/policy_statistics_collector.h
ore/common/policy_statistics_collector_unittest.cc
ore/common/policy_switches.cc
ore/common/policy_switches.h
ore/common/policy_test_utils.cc
ore/common/policy_test_utils.h
ore/common/preferences_mac.cc
ore/common/preferences_mac.h
ore/common/preferences_mock_mac.cc
ore/common/preferences_mock_mac.h
ore/common/preg_parser_win.cc
ore/common/preg_parser_win.h
ore/common/preg_parser_win_unittest.cc
ore/common/registry_dict_win.cc
ore/common/registry_dict_win.h
ore/common/registry_dict_win_unittest.cc
ore/common/schema.cc
ore/common/schema_registry.h
ore/common/schema_unittest.cc
roto/PRESUBMIT.py
roto/chrome_extension_policy.proto
roto/device_management_backend.proto
roto/device_management_local.proto
f2477e01787aa58f445919b809d89e252beef54f 28-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 237746

This commit was generated by merge_to_master.py.

Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
ore/DEPS
ore/common/external_data_fetcher.cc
ore/common/external_data_fetcher.h
ore/common/external_data_manager.h
ore/common/policy_bundle.cc
ore/common/policy_bundle.h
ore/common/policy_bundle_unittest.cc
ore/common/policy_details.h
ore/common/policy_map.cc
ore/common/policy_map.h
ore/common/policy_map_unittest.cc
ore/common/policy_namespace.h
ore/common/policy_switches.cc
ore/common/policy_switches.h
ore/common/policy_types.h
ore/common/registry_dict_win.cc
ore/common/registry_dict_win.h
ore/common/registry_dict_win_unittest.cc
ore/common/schema.cc
ore/common/schema.h
ore/common/schema_internal.h
ore/common/schema_map.cc
ore/common/schema_map.h
ore/common/schema_map_unittest.cc
ore/common/schema_registry.cc
ore/common/schema_registry.h
ore/common/schema_registry_unittest.cc
ore/common/schema_unittest.cc
1e9bf3e0803691d0a228da41fc608347b6db4340 31-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232015

This commit was generated by merge_to_master.py.

Change-Id: If86767ad396b9e2e1a4c1e9df1427daea29703ef
ore/common/policy_namespace.cc
ore/common/policy_namespace.h
tub_to_remove.cc
8bcbed890bc3ce4d7a057a8f32cab53fa534672e 22-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 230120

This commit was generated by merge_to_master.py.

Change-Id: I54bc06b7ee8a07092e74ce3b68c6893508349042
ore/common/policy_pref_names.cc
ore/common/policy_pref_names.h
ore/common/policy_switches.cc
ore/common/policy_switches.h
4e180b6a0b4720a9b8e9e959a882386f690f08ff 18-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 228962

This commit was generated by merge_to_master.py.

Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
WNERS
68043e1e95eeb07d5cae7aca370b26518b0867d6 26-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 225410

This commit was generated by merge_to_master.py.

Change-Id: Ifa1539ca216abb163295ee7a77f81bb67f52e178
ore/common/policy_schema.cc
ore/common/policy_schema.h
ore/common/policy_schema_unittest.cc
ore/common/schema.cc
ore/common/schema.h
d0247b1b59f9c528cb6df88b4f2b9afaf80d181e 19-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 224184

This commit was generated by merge_to_master.py.

Change-Id: Ia3424df5abed9bea642c522b9e2358dceabd8423
ore/common/policy_pref_names.cc
ore/common/policy_pref_names.h
ore/common/schema.cc
ore/common/schema.h
ore/common/schema_internal.h
ore/common/schema_unittest.cc
3551c9c881056c480085172ff9840cab31610854 23-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r219274

This commit was generated by merge_to_master.py.

Change-Id: Ibb7f41396cadf4071e89153e1913c986d126f65d
WNERS
ore/common/policy_schema.cc
ore/common/policy_schema.h
ore/common/policy_schema_unittest.cc
olicy_export.h
tub_to_remove.cc