Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(318)

Unified Diff: third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/proto/ChannelCommon.java

Issue 1246033002: Roll cacheinvalidation to 20150720 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/proto/ChannelCommon.java
diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/proto/ChannelCommon.java b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/proto/ChannelCommon.java
index bed01e6c0400809d9463147ee7c9f2ec1f1bc57a..549f6fc2b78907a6cf13c623b6ee65b346e1236a 100644
--- a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/proto/ChannelCommon.java
+++ b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/proto/ChannelCommon.java
@@ -33,7 +33,6 @@ public interface ChannelCommon {
public static final class ChannelMessageEncoding extends ProtoWrapper {
public interface MessageEncoding {
public static final int PROTOBUF_BINARY_FORMAT = 1;
- public static final int PROTOBUF_JSON_FORMAT = 2;
}
public static ChannelMessageEncoding create() {
@@ -92,11 +91,8 @@ public interface ChannelCommon {
public static final class NetworkEndpointId extends ProtoWrapper {
public interface NetworkAddress {
public static final int TEST = 1;
- public static final int BUZZ = 111;
- public static final int STUBBY = 112;
public static final int ANDROID = 113;
public static final int LCS = 114;
- public static final int TIPS_STUBBY = 115;
}
public static NetworkEndpointId create(Integer networkAddress,

Powered by Google App Engine
This is Rietveld 408576698