diff options
| author | jkummerow@chromium.org <jkummerow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-16 14:37:00 +0000 |
|---|---|---|
| committer | jkummerow@chromium.org <jkummerow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-16 14:37:00 +0000 |
| commit | 1e16fd462495798e68603560a2a44de2109d14a6 (patch) | |
| tree | 80db982880e6f4e4a746e2753e64ebbe7ed9cd3e /chrome_frame/chrome_frame.gyp | |
| parent | c574bcd52bd3ff2e8e9a8e2ff1505ee6bc328b73 (diff) | |
| download | chromium_src-1e16fd462495798e68603560a2a44de2109d14a6.zip chromium_src-1e16fd462495798e68603560a2a44de2109d14a6.tar.gz chromium_src-1e16fd462495798e68603560a2a44de2109d14a6.tar.bz2 | |
Revert 75106 - New policy protobuf protocol.
(Second attempt to land http://codereview.chromium.org/6409040/)
- cloud_policy.proto autogenerated from policy_templats.json
- C++ method decoding the protobuf also 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/6523058
TBR=jkummerow@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75115 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame.gyp')
| -rw-r--r-- | chrome_frame/chrome_frame.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index 00662af4..4bde4aa 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -109,7 +109,7 @@ 'type': 'executable', 'dependencies': [ '../base/base.gyp:test_support_base', - '../chrome/app/policy/cloud_policy_codegen.gyp:policy', + '../chrome/chrome.gyp:policy', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', 'chrome_frame_ie', @@ -757,7 +757,7 @@ 'chrome_frame_utils', 'chrome_tab_idl', '../chrome/chrome.gyp:common', - '../chrome/app/policy/cloud_policy_codegen.gyp:policy', + '../chrome/chrome.gyp:policy', '../chrome/chrome.gyp:utility', '../build/temp_gyp/googleurl.gyp:googleurl', '../third_party/libxml/libxml.gyp:libxml', |