diff options
author | mgiuca <mgiuca@chromium.org> | 2015-03-23 22:15:16 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-24 05:16:13 +0000 |
commit | b16d99f9e5a9f46a62b8fc62662a4f6cd23cff17 (patch) | |
tree | 3ba48893cc68e813e9b2987d206fa6471b805f8b /components/data_reduction_proxy/proto | |
parent | fcb6e502d22dd09b6f2501cc9dfb08da7bbf74f1 (diff) | |
download | chromium_src-b16d99f9e5a9f46a62b8fc62662a4f6cd23cff17.zip chromium_src-b16d99f9e5a9f46a62b8fc62662a4f6cd23cff17.tar.gz chromium_src-b16d99f9e5a9f46a62b8fc62662a4f6cd23cff17.tar.bz2 |
Revert of Add ClientConfig proto, and JSON generation/parsing. (patchset #6 id:100001 of https://codereview.chromium.org/1017853003/)
Reason for revert:
Seems that some of the tests introduced in this CL are failing on builders:
http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%281%29%2832%29/builds/11450/steps/components_unittests/logs/stdio
Value of: config_parser::TimeToISO8601(test.time)
Actual: "2009-04-22T19:24:48.000Z"
Expected: test.expected
Which is: "1601-01-01T00:00:00.000Z"
[ FAILED ] ClientConfigParserTest.TimeToISO8601 (0 ms)
Value of: config_parser::TimestampToTime(ts)
Actual: 1964-11-24 17:31:43.000 UTC
Expected: test.expected_time
Which is: 2038-01-19 03:14:07.999 UTC
[ FAILED ] ClientConfigParserTest.TimestampToTime (0 ms)
No idea why they are failing there, or why they passed on the trybots.
Original issue's description:
> Add ClientConfig proto, and JSON generation/parsing.
>
> - Add the ClientConfig proto definition corresponding to the response
> coming from the service.
> - Create a means of generating a pseudo response from the built in
> params and request options.
> - Create a class to parse the JSON response.
> - Add necessary helper classes for the ProxyScheme and time values
> coming from the service.
>
> BUG=466753
>
> Committed: https://crrev.com/97652ebe50c4be712aa976776bee9694cbce1178
> Cr-Commit-Position: refs/heads/master@{#321931}
TBR=bengr@chromium.org,sclittle@chromium.org,jeremyim@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=466753
Review URL: https://codereview.chromium.org/1020863009
Cr-Commit-Position: refs/heads/master@{#321936}
Diffstat (limited to 'components/data_reduction_proxy/proto')
-rw-r--r-- | components/data_reduction_proxy/proto/BUILD.gn | 11 | ||||
-rw-r--r-- | components/data_reduction_proxy/proto/client_config.proto | 70 |
2 files changed, 0 insertions, 81 deletions
diff --git a/components/data_reduction_proxy/proto/BUILD.gn b/components/data_reduction_proxy/proto/BUILD.gn deleted file mode 100644 index 889c106..0000000 --- a/components/data_reduction_proxy/proto/BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 2015 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. - -import("//third_party/protobuf/proto_library.gni") - -proto_library("data_reduction_proxy_proto") { - sources = [ - "client_config.proto", - ] -} diff --git a/components/data_reduction_proxy/proto/client_config.proto b/components/data_reduction_proxy/proto/client_config.proto deleted file mode 100644 index f2c796c..0000000 --- a/components/data_reduction_proxy/proto/client_config.proto +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright 2015 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. - -syntax = "proto2"; - -option optimize_for = LITE_RUNTIME; - -package data_reduction_proxy; - -// The client configuration information for using the Data Saver service. -message ClientConfig { - // An opaque per-session key assigned by the server which permits use of the - // Data Saver HTTP proxy servers. - optional string session_key = 1; - // The time at which the secure_session_key is no longer valid. This is - // enforced by the Data Saver service, and is provided to permit the client - // to request a new session key prior to expiration. - optional Timestamp expire_time = 2; - // The DataSaver proxy configuration that is valid for the session. - optional ProxyConfig proxy_config = 3; -} - -// A Timestamp represents a point in time independent of any time zone -// or calendar, represented as seconds and fractions of seconds at -// nanosecond resolution in UTC Epoch time. -message Timestamp { - // Represents seconds of UTC time since Unix epoch - // 1970-01-01T00:00:00Z. Must be from from 0001-01-01T00:00:00Z to - // 9999-12-31T23:59:59Z inclusive. - optional int64 seconds = 1; - - // Non-negative fractions of a second at nanosecond resolution. Negative - // second values with fractions must still have non-negative nanos values - // that count forward in time. Must be from 0 to 999,999,999 - // inclusive. - optional int32 nanos = 2; -} - -// Data Saver proxy configuration. -message ProxyConfig { - // Provides proxy server information for HTTP URIs. - repeated ProxyServer http_proxy_servers = 1; -} - -// Configuration information for a specific proxy server. -message ProxyServer { - // The scheme of the proxy server. - enum ProxyScheme { - // The proxy scheme is unspecified. - UNSPECIFIED = 0; - // HTTP - HTTP = 1; - // HTTPS - HTTPS = 2; - // HTTPS over QUIC - QUIC = 3; - } - - // The scheme for the proxy server. - optional ProxyScheme scheme = 1; - // The host name for the proxy server. - optional string host = 2; - // The port number for the proxy server. - optional int32 port = 3; -} - -// Request object to create a client configuration object. -message CreateClientConfigRequest { -} |