Update //third_party/protobuf to version 3.

third_party/protobuf/src/google/protobuf/compiler/javanano/javanano_enum.h

Index: third_party/protobuf/src/google/protobuf/compiler/javanano/javanano_enum.h
diff --git a/third_party/protobuf/src/google/protobuf/compiler/java/java_enum.h b/third_party/protobuf/src/google/protobuf/compiler/javanano/javanano_enum.h
similarity index 88%
copy from third_party/protobuf/src/google/protobuf/compiler/java/java_enum.h
copy to third_party/protobuf/src/google/protobuf/compiler/javanano/javanano_enum.h
index 9a9e5742ac3b8590e2e2c00de5123e681a53494e..10dd364876f9c6de65f58d4d03558aa09b52dc3b 100644
--- a/third_party/protobuf/src/google/protobuf/compiler/java/java_enum.h
+++ b/third_party/protobuf/src/google/protobuf/compiler/javanano/javanano_enum.h
@@ -32,11 +32,13 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_ENUM_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_ENUM_H__
+#ifndef GOOGLE_PROTOBUF_COMPILER_JAVANANO_ENUM_H__
+#define GOOGLE_PROTOBUF_COMPILER_JAVANANO_ENUM_H__
 
 #include <string>
 #include <vector>
+
+#include <google/protobuf/compiler/javanano/javanano_params.h>
 #include <google/protobuf/descriptor.h>
 
 namespace google {
@@ -48,16 +50,17 @@ namespace protobuf {
 
 namespace protobuf {
 namespace compiler {
-namespace java {
+namespace javanano {
 
 class EnumGenerator {
  public:
-  explicit EnumGenerator(const EnumDescriptor* descriptor);
+  explicit EnumGenerator(const EnumDescriptor* descriptor, const Params& params);
   ~EnumGenerator();
 
   void Generate(io::Printer* printer);
 
  private:
+  const Params& params_;
   const EnumDescriptor* descriptor_;
 
   // The proto language allows multiple enum constants to have the same numeric
@@ -73,14 +76,12 @@ class EnumGenerator {
   };
   vector<Alias> aliases_;
 
-  bool CanUseEnumValues();
-
   GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(EnumGenerator);
 };
 
-}  // namespace java
+}  // namespace javanano
 }  // namespace compiler
 }  // namespace protobuf
 
 }  // namespace google
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_ENUM_H__
+#endif  // GOOGLE_PROTOBUF_COMPILER_JAVANANO_ENUM_H__