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

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

Index: third_party/protobuf/src/google/protobuf/compiler/java/java_shared_code_generator.h
diff --git a/third_party/protobuf/src/google/protobuf/compiler/java/java_shared_code_generator.h b/third_party/protobuf/src/google/protobuf/compiler/java/java_shared_code_generator.h
index c8ead47a7aa0b5f944d50c1086018b5ca4da73e2..3b573c075858a34e6b12ebe84f29c1f0e5cfd6fc 100644
--- a/third_party/protobuf/src/google/protobuf/compiler/java/java_shared_code_generator.h
+++ b/third_party/protobuf/src/google/protobuf/compiler/java/java_shared_code_generator.h
@@ -43,7 +43,6 @@
 #include <vector>
 
 #include <google/protobuf/stubs/common.h>
-#include <google/protobuf/compiler/java/java_options.h>
 
 namespace google {
 namespace protobuf {
@@ -67,12 +66,15 @@ namespace java {
 // and mutable API. Currently only descriptors are shared.
 class SharedCodeGenerator {
  public:
-  SharedCodeGenerator(const FileDescriptor* file, const Options& options);
+  explicit SharedCodeGenerator(const FileDescriptor* file);
   ~SharedCodeGenerator();
 
   void Generate(GeneratorContext* generator_context,
-                std::vector<string>* file_list,
-                std::vector<string>* annotation_file_list);
+                vector<string>* file_list);
+
+  void SetEnforceLite(bool value) {
+    enforce_lite_ = value;
+  }
 
   void GenerateDescriptors(io::Printer* printer);
 
@@ -83,8 +85,8 @@ class SharedCodeGenerator {
   bool ShouldIncludeDependency(const FileDescriptor* descriptor);
 
   google::protobuf::scoped_ptr<ClassNameResolver> name_resolver_;
+  bool enforce_lite_;
   const FileDescriptor* file_;
-  const Options options_;
   GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(SharedCodeGenerator);
 };