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

Unified Diff: third_party/protobuf/java/core/src/test/java/com/google/protobuf/UnknownFieldSetTest.java

Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: owners Created 4 years, 7 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/protobuf/java/core/src/test/java/com/google/protobuf/UnknownFieldSetTest.java
diff --git a/third_party/protobuf/java/src/test/java/com/google/protobuf/UnknownFieldSetTest.java b/third_party/protobuf/java/core/src/test/java/com/google/protobuf/UnknownFieldSetTest.java
similarity index 99%
rename from third_party/protobuf/java/src/test/java/com/google/protobuf/UnknownFieldSetTest.java
rename to third_party/protobuf/java/core/src/test/java/com/google/protobuf/UnknownFieldSetTest.java
index 8c9dcafeedaf96e09351fbcdc9fb8a515c338686..32380f700ac0fce21fb52b6bb076176be2e008bc 100644
--- a/third_party/protobuf/java/src/test/java/com/google/protobuf/UnknownFieldSetTest.java
+++ b/third_party/protobuf/java/core/src/test/java/com/google/protobuf/UnknownFieldSetTest.java
@@ -50,6 +50,7 @@ import java.util.Map;
* @author kenton@google.com (Kenton Varda)
*/
public class UnknownFieldSetTest extends TestCase {
+ @Override
public void setUp() throws Exception {
descriptor = TestAllTypes.getDescriptor();
allFields = TestUtil.getAllSet();

Powered by Google App Engine
This is Rietveld 408576698