Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

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

Index: third_party/protobuf/src/google/protobuf/compiler/java/java_context.h
diff --git a/third_party/protobuf/src/google/protobuf/compiler/java/java_context.h b/third_party/protobuf/src/google/protobuf/compiler/java/java_context.h
index b22e7e3a2487fe04a7ac8024766369df93098914..a480e45dc40cdb98067b869fddd32e8977dccef0 100644
--- a/third_party/protobuf/src/google/protobuf/compiler/java/java_context.h
+++ b/third_party/protobuf/src/google/protobuf/compiler/java/java_context.h
@@ -39,7 +39,6 @@
 #include <vector>
 
 #include <google/protobuf/stubs/common.h>
-#include <google/protobuf/compiler/java/java_options.h>
 
 namespace google {
 namespace protobuf {
@@ -65,7 +64,7 @@ struct OneofGeneratorInfo;
 // generators.
 class Context {
  public:
-  Context(const FileDescriptor* file, const Options& options);
+  explicit Context(const FileDescriptor* file);
   ~Context();
 
   // Get the name resolver associated with this context. The resolver
@@ -80,12 +79,15 @@ class Context {
   const OneofGeneratorInfo* GetOneofGeneratorInfo(
       const OneofDescriptor* oneof) const;
 
-  const Options& options() const { return options_; }
-
   // Enforces all the files (including transitive dependencies) to use
   // LiteRuntime.
+  void SetEnforceLite(bool enforce_lite) {
+    enforce_lite_ = enforce_lite;
+  }
 
-  bool EnforceLite() const { return options_.enforce_lite; }
+  bool EnforceLite() const {
+    return enforce_lite_;
+  }
 
   // Does this message class have generated parsing, serialization, and other
   // standard methods for which reflection-based fallback implementations exist?
@@ -95,14 +97,12 @@ class Context {
   void InitializeFieldGeneratorInfo(const FileDescriptor* file);
   void InitializeFieldGeneratorInfoForMessage(const Descriptor* message);
   void InitializeFieldGeneratorInfoForFields(
-      const std::vector<const FieldDescriptor*>& fields);
+      const vector<const FieldDescriptor*>& fields);
 
   google::protobuf::scoped_ptr<ClassNameResolver> name_resolver_;
-  std::map<const FieldDescriptor*, FieldGeneratorInfo>
-      field_generator_info_map_;
-  std::map<const OneofDescriptor*, OneofGeneratorInfo>
-      oneof_generator_info_map_;
-  Options options_;
+  map<const FieldDescriptor*, FieldGeneratorInfo> field_generator_info_map_;
+  map<const OneofDescriptor*, OneofGeneratorInfo> oneof_generator_info_map_;
+  bool enforce_lite_;
   GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Context);
 };