1 files changed, 7 insertions, 16 deletions

diff --git a/src/google/protobuf/util/internal/default_value_objectwriter.h b/src/google/protobuf/util/internal/default_value_objectwriter.h
index bcb526e8..695b9dd8 100644
--- a/src/google/protobuf/util/internal/default_value_objectwriter.h
+++ b/src/google/protobuf/util/internal/default_value_objectwriter.h
@@ -98,8 +98,6 @@ class LIBPROTOBUF_EXPORT DefaultValueObjectWriter : public ObjectWriter {
 
   virtual DefaultValueObjectWriter* RenderNull(StringPiece name);
 
-  virtual DefaultValueObjectWriter* DisableCaseNormalizationForNextKey();
-
  private:
   enum NodeKind {
     PRIMITIVE = 0,
@@ -149,10 +147,6 @@ class LIBPROTOBUF_EXPORT DefaultValueObjectWriter : public ObjectWriter {
 
     void set_data(const DataPiece& data) { data_ = data; }
 
-    void set_disable_normalize(bool disable_normalize) {
-      disable_normalize_ = disable_normalize;
-    }
-
     bool is_any() { return is_any_; }
 
     void set_is_any(bool is_any) { is_any_ = is_any; }
@@ -176,8 +170,6 @@ class LIBPROTOBUF_EXPORT DefaultValueObjectWriter : public ObjectWriter {
     const google::protobuf::Type* type_;
     // The kind of this node.
     NodeKind kind_;
-    // Whether to disable case normalization of the name.
-    bool disable_normalize_;
     // Whether this is a node for "Any".
     bool is_any_;
     // The data of this node when it is a leaf node.
@@ -201,16 +193,17 @@ class LIBPROTOBUF_EXPORT DefaultValueObjectWriter : public ObjectWriter {
 
   // Creates a DataPiece containing the default value of the type of the field.
   static DataPiece CreateDefaultDataPieceForField(
-      const google::protobuf::Field& field);
-
-  // Returns disable_normalize_ and reset it to false.
-  bool GetAndResetDisableNormalize() {
-    return disable_normalize_ ? (disable_normalize_ = false, true) : false;
-  }
+      const google::protobuf::Field& field, const TypeInfo* typeinfo);
 
   // Adds or replaces the data_ of a primitive child node.
   void RenderDataPiece(StringPiece name, const DataPiece& data);
 
+  // Returns the default enum value as a DataPiece, or the first enum value if
+  // there is no default. For proto3, where we cannot specify an explicit
+  // default, a zero value will always be returned.
+  static DataPiece FindEnumDefault(const google::protobuf::Field& field,
+                                   const TypeInfo* typeinfo);
+
   // Type information for all the types used in the descriptor. Used to find
   // google::protobuf::Type of nested messages/enums.
   const TypeInfo* typeinfo_;
@@ -221,8 +214,6 @@ class LIBPROTOBUF_EXPORT DefaultValueObjectWriter : public ObjectWriter {
   // Holds copies of strings passed to RenderString.
   vector<string*> string_values_;
 
-  // Whether to disable case normalization of the next node.
-  bool disable_normalize_;
   // The current Node. Owned by its parents.
   Node* current_;
   // The root Node.