Revert https://codereview.chromium.org/1291903002 (protobuf roll).

third_party/protobuf/src/google/protobuf/compiler/java/java_message_field.h

Index: third_party/protobuf/src/google/protobuf/compiler/java/java_message_field.h
diff --git a/third_party/protobuf/src/google/protobuf/compiler/java/java_message_field.h b/third_party/protobuf/src/google/protobuf/compiler/java/java_message_field.h
index ea8225a5faa63097a1e3f6f4962c95a966879c1e..5c8078a15d699dc5f179178dd448d2f085beb800 100644
--- a/third_party/protobuf/src/google/protobuf/compiler/java/java_message_field.h
+++ b/third_party/protobuf/src/google/protobuf/compiler/java/java_message_field.h
@@ -1,6 +1,6 @@
 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
+// http://code.google.com/p/protobuf/
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -41,26 +41,16 @@
 
 namespace google {
 namespace protobuf {
-  namespace compiler {
-    namespace java {
-      class Context;           // context.h
-      class ClassNameResolver; // name_resolver.h
-    }
-  }
-}
-
-namespace protobuf {
 namespace compiler {
 namespace java {
 
-class ImmutableMessageFieldGenerator : public ImmutableFieldGenerator {
+class MessageFieldGenerator : public FieldGenerator {
  public:
-  explicit ImmutableMessageFieldGenerator(
-      const FieldDescriptor* descriptor, int messageBitIndex,
-      int builderBitIndex, Context* context);
-  ~ImmutableMessageFieldGenerator();
+  explicit MessageFieldGenerator(const FieldDescriptor* descriptor,
+      int messageBitIndex, int builderBitIndex);
+  ~MessageFieldGenerator();
 
-  // implements ImmutableFieldGenerator ---------------------------------------
+  // implements FieldGenerator ---------------------------------------
   int GetNumBitsForMessage() const;
   int GetNumBitsForBuilder() const;
   void GenerateInterfaceMembers(io::Printer* printer) const;
@@ -80,13 +70,13 @@ class ImmutableMessageFieldGenerator : public ImmutableFieldGenerator {
 
   string GetBoxedType() const;
 
- protected:
+ private:
   const FieldDescriptor* descriptor_;
   map<string, string> variables_;
   const int messageBitIndex_;
   const int builderBitIndex_;
-  Context* context_;
-  ClassNameResolver* name_resolver_;
+
+  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageFieldGenerator);
 
   void PrintNestedBuilderCondition(io::Printer* printer,
       const char* regular_case, const char* nested_builder_case) const;
@@ -94,39 +84,15 @@ class ImmutableMessageFieldGenerator : public ImmutableFieldGenerator {
       const char* method_prototype, const char* regular_case,
       const char* nested_builder_case,
       const char* trailing_code) const;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ImmutableMessageFieldGenerator);
 };
 
-class ImmutableMessageOneofFieldGenerator
-    : public ImmutableMessageFieldGenerator {
+class RepeatedMessageFieldGenerator : public FieldGenerator {
  public:
-  ImmutableMessageOneofFieldGenerator(
-      const FieldDescriptor* descriptor, int messageBitIndex,
-      int builderBitIndex, Context* context);
-  ~ImmutableMessageOneofFieldGenerator();
+  explicit RepeatedMessageFieldGenerator(const FieldDescriptor* descriptor,
+      int messageBitIndex, int builderBitIndex);
+  ~RepeatedMessageFieldGenerator();
 
-  void GenerateMembers(io::Printer* printer) const;
-  void GenerateBuilderMembers(io::Printer* printer) const;
-  void GenerateBuildingCode(io::Printer* printer) const;
-  void GenerateMergingCode(io::Printer* printer) const;
-  void GenerateParsingCode(io::Printer* printer) const;
-  void GenerateSerializationCode(io::Printer* printer) const;
-  void GenerateSerializedSizeCode(io::Printer* printer) const;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ImmutableMessageOneofFieldGenerator);
-};
-
-class RepeatedImmutableMessageFieldGenerator : public ImmutableFieldGenerator {
- public:
-  explicit RepeatedImmutableMessageFieldGenerator(
-      const FieldDescriptor* descriptor, int messageBitIndex,
-      int builderBitIndex, Context* context);
-  ~RepeatedImmutableMessageFieldGenerator();
-
-  // implements ImmutableFieldGenerator ---------------------------------------
+  // implements FieldGenerator ---------------------------------------
   int GetNumBitsForMessage() const;
   int GetNumBitsForBuilder() const;
   void GenerateInterfaceMembers(io::Printer* printer) const;
@@ -146,13 +112,13 @@ class RepeatedImmutableMessageFieldGenerator : public ImmutableFieldGenerator {
 
   string GetBoxedType() const;
 
- protected:
+ private:
   const FieldDescriptor* descriptor_;
   map<string, string> variables_;
   const int messageBitIndex_;
   const int builderBitIndex_;
-  Context* context_;
-  ClassNameResolver* name_resolver_;
+
+  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(RepeatedMessageFieldGenerator);
 
   void PrintNestedBuilderCondition(io::Printer* printer,
       const char* regular_case, const char* nested_builder_case) const;
@@ -160,9 +126,6 @@ class RepeatedImmutableMessageFieldGenerator : public ImmutableFieldGenerator {
       const char* method_prototype, const char* regular_case,
       const char* nested_builder_case,
       const char* trailing_code) const;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(RepeatedImmutableMessageFieldGenerator);
 };
 
 }  // namespace java