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

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

Index: third_party/protobuf/src/google/protobuf/compiler/java/java_service.h
diff --git a/third_party/protobuf/src/google/protobuf/compiler/java/java_service.h b/third_party/protobuf/src/google/protobuf/compiler/java/java_service.h
index 6707e821a9f2fb60766c8342b36929332a73a136..e07eebf75ac16584906086a36cd4f77226ddd330 100644
--- a/third_party/protobuf/src/google/protobuf/compiler/java/java_service.h
+++ b/third_party/protobuf/src/google/protobuf/compiler/java/java_service.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
@@ -40,14 +40,8 @@
 
 namespace google {
 namespace protobuf {
-  namespace compiler {
-    namespace java {
-      class Context;            // context.h
-      class ClassNameResolver;  // name_resolver.h
-    }
-  }
   namespace io {
-    class Printer;              // printer.h
+    class Printer;             // printer.h
   }
 }
 
@@ -58,27 +52,9 @@ namespace java {
 class ServiceGenerator {
  public:
   explicit ServiceGenerator(const ServiceDescriptor* descriptor);
-  virtual ~ServiceGenerator();
-
-  virtual void Generate(io::Printer* printer) = 0;
-
-  enum RequestOrResponse { REQUEST, RESPONSE };
-  enum IsAbstract { IS_ABSTRACT, IS_CONCRETE };
-
- protected:
-  const ServiceDescriptor* descriptor_;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ServiceGenerator);
-};
+  ~ServiceGenerator();
 
-class ImmutableServiceGenerator : public ServiceGenerator {
- public:
-  explicit ImmutableServiceGenerator(const ServiceDescriptor* descriptor,
-                                     Context* context);
-  virtual ~ImmutableServiceGenerator();
-
-  virtual void Generate(io::Printer* printer);
+  void Generate(io::Printer* printer);
 
  private:
 
@@ -104,6 +80,7 @@ class ImmutableServiceGenerator : public ServiceGenerator {
   void GenerateCallBlockingMethod(io::Printer* printer);
 
   // Generate the implementations of Service.get{Request,Response}Prototype().
+  enum RequestOrResponse { REQUEST, RESPONSE };
   void GenerateGetPrototype(RequestOrResponse which, io::Printer* printer);
 
   // Generate a stub implementation of the service.
@@ -111,6 +88,7 @@ class ImmutableServiceGenerator : public ServiceGenerator {
 
   // Generate a method signature, possibly abstract, without body or trailing
   // semicolon.
+  enum IsAbstract { IS_ABSTRACT, IS_CONCRETE };
   void GenerateMethodSignature(io::Printer* printer,
                                const MethodDescriptor* method,
                                IsAbstract is_abstract);
@@ -122,9 +100,9 @@ class ImmutableServiceGenerator : public ServiceGenerator {
   void GenerateBlockingMethodSignature(io::Printer* printer,
                                        const MethodDescriptor* method);
 
-  Context* context_;
-  ClassNameResolver* name_resolver_;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ImmutableServiceGenerator);
+  const ServiceDescriptor* descriptor_;
+
+  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ServiceGenerator);
 };
 
 }  // namespace java