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

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

 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
 // https://developers.google.com/protocol-buffers/
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
@@ skipping 21 matching lines @@
 #define GOOGLE_PROTOBUF_COMPILER_JAVA_CONTEXT_H__
 
 #include <map>
 #include <memory>
 #ifndef _SHARED_PTR_H
 #include <google/protobuf/stubs/shared_ptr.h>
 #endif
 #include <vector>
 
 #include <google/protobuf/stubs/common.h>
-#include <google/protobuf/compiler/java/java_options.h>
 
 namespace google {
 namespace protobuf {
   class FileDescriptor;
   class FieldDescriptor;
   class OneofDescriptor;
   class Descriptor;
   class EnumDescriptor;
   namespace compiler {
     namespace java {
       class ClassNameResolver;  // name_resolver.h
     }
   }
 }  // namespace protobuf
 
 namespace protobuf {
 namespace compiler {
 namespace java {
 
 struct FieldGeneratorInfo;
 struct OneofGeneratorInfo;
 // A context object holds the information that is shared among all code
 // 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
   // can be used to map descriptors to Java class names.
   ClassNameResolver* GetNameResolver();
 
   // Get the FieldGeneratorInfo for a given field.
   const FieldGeneratorInfo* GetFieldGeneratorInfo(
       const FieldDescriptor* field) const;
 
   // Get the OneofGeneratorInfo for a given oneof.
   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?
   bool HasGeneratedMethods(const Descriptor* descriptor) const;
 
  private:
   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);
 };
 
 }  // namespace java
 }  // namespace compiler
 }  // namespace protobuf
 
 }  // namespace google
 #endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_CONTEXT_H__