Revert 75082 - New policy protobuf protocol.

- cloud_policy.proto autogenerated from policy_templates.json
- C++ method decoding the protobuf autogenerated from policy_templates.json
- changed policy fetching mechanism to fetch new-style policy protobufs

BUG=68309, chromium-os:11253, chromium-os:11255
TEST=CloudPolicyCacheTest.*; also manual test against python testserver

Review URL: http://codereview.chromium.org/6409040

TBR=jkummerow@chromium.org

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75084 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 20 insertions, 3 deletions

diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 5819021..3bd81cc 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -29,8 +29,9 @@
         'chrome_gpu',
         'chrome_resources',
         'chrome_strings',
-        'app/policy/cloud_policy_codegen.gyp:policy',
         'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
+        'browser/policy/proto/device_management_proto.gyp:device_management_proto_cpp',
+        'policy',
         'theme_resources',
         '../base/base.gyp:test_support_base',
         '../ipc/ipc.gyp:test_support_ipc',
@@ -43,7 +44,6 @@
       ],
       'export_dependent_settings': [
         'renderer',
-        'app/policy/cloud_policy_codegen.gyp:policy',
       ],
       'include_dirs': [
         '..',
@@ -204,6 +204,7 @@
         'test_support_common',
         'chrome_resources',
         'chrome_strings',
+        'policy',
         'theme_resources',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
@@ -268,6 +269,7 @@
         'test_support_common',
         'chrome_resources',
         'chrome_strings',
+        'policy',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
       ],
@@ -295,6 +297,7 @@
       'msvs_guid': 'D2250C20-3A94-4FB9-AF73-11BC5B73884B',
       'dependencies': [
         'browser',
+        'policy',
         'renderer',
         'test_support_common',
         'test_support_ui',
@@ -353,6 +356,7 @@
         'chrome_resources',
         'chrome_strings',
         'debugger',
+        'policy',
         'syncapi',
         'test_support_common',
         'test_support_ui',
@@ -1018,6 +1022,7 @@
         'common',
         'chrome_resources',
         'chrome_strings',
+        'policy',
         'test_support_ui',
         '../base/base.gyp:base',
         '../build/temp_gyp/googleurl.gyp:googleurl',
@@ -1085,6 +1090,7 @@
         'chrome_resources',
         'chrome_strings',
         'common',
+        'policy',
         'profile_import',
         'renderer',
         'service',
@@ -1402,7 +1408,6 @@
         'browser/policy/asynchronous_policy_provider_unittest.cc',
         'browser/policy/asynchronous_policy_test_base.cc',
         'browser/policy/asynchronous_policy_test_base.h',
-        'browser/policy/cloud_policy_cache_unittest.cc',
         'browser/policy/config_dir_policy_provider_unittest.cc',
         'browser/policy/configuration_policy_pref_store_unittest.cc',
         'browser/policy/configuration_policy_provider_mac_unittest.cc',
@@ -1412,6 +1417,7 @@
         'browser/policy/device_management_backend_mock.cc',
         'browser/policy/device_management_backend_mock.h',
         'browser/policy/device_management_service_unittest.cc',
+        'browser/policy/device_management_policy_cache_unittest.cc',
         'browser/policy/device_management_policy_provider_unittest.cc',
         'browser/policy/managed_prefs_banner_base_unittest.cc',
         'browser/policy/mock_configuration_policy_provider.cc',
@@ -2085,6 +2091,7 @@
         'chrome',
         'chrome_resources',
         'chrome_strings',
+        'policy',
         'profile_import',
         'renderer',
         'test_support_common',
@@ -2465,6 +2472,7 @@
       'msvs_guid': 'BBF2BC2F-7CD8-463E-BE88-CB81AAD92BFE',
       'dependencies': [
         'chrome',
+        'policy',
         'test_support_common',
         '../app/app.gyp:app_resources',
         '../base/base.gyp:base',
@@ -2717,6 +2725,7 @@
       'dependencies': [
         'chrome',
         'debugger',
+        'policy',
         'test_support_common',
         'test_support_ui',
         'theme_resources',
@@ -2751,6 +2760,7 @@
       'dependencies': [
         'chrome',
         'debugger',
+        'policy',
         'test_support_common',
         'test_support_ui',
         'theme_resources',
@@ -2780,6 +2790,7 @@
       'dependencies': [
         'chrome',
         'debugger',
+        'policy',
         'test_support_common',
         'test_support_ui',
         'theme_resources',
@@ -2964,6 +2975,7 @@
         'chrome',
         'chrome_resources',
         'common',
+        'policy',
         'profile_import',
         'renderer',
         'chrome_strings',
@@ -3122,6 +3134,7 @@
         'chrome',
         'chrome_resources',
         'chrome_strings',
+        'policy',
         'renderer',
         'test_support_common',
         '../app/app.gyp:app_base',
@@ -3215,6 +3228,7 @@
         'chrome',
         'chrome_resources',
         'chrome_strings',
+        'policy',
         'test_support_common',
         'test_support_ui',
         '../skia/skia.gyp:skia',
@@ -3323,6 +3337,7 @@
           'dependencies': [
             'test_support_common',
             'browser',
+            'policy',
             'renderer',
             'syncapi',
             '../base/base.gyp:base',
@@ -3400,6 +3415,7 @@
           'dependencies': [
             'chrome_resources',
             'chrome_strings',
+            'policy',
             'test_support_common',
             'test_support_ui',
             '../skia/skia.gyp:skia',
@@ -3455,6 +3471,7 @@
           'product_prefix': '_',
           'dependencies': [
             'chrome',
+            'policy',
             'debugger',
             'syncapi',
             'test_support_common',