From c8074527b2c98e132061f79b48f06f0c5154b9fb Mon Sep 17 00:00:00 2001
From: Yuchen Zeng <zyc@google.com>
Date: Fri, 3 Jun 2016 14:36:11 -0700
Subject: [PATCH] Remove unnecessary headers

---
 .../impl/proto_server_reflection_plugin.h      |  6 ++----
 .../reflection/proto_server_reflection.cc      |  3 ---
 .../reflection/proto_server_reflection.h       |  3 ---
 .../proto_server_reflection_plugin.cc          | 18 ++++++++++--------
 .../proto_reflection_descriptor_database.h     |  1 -
 5 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/extensions/include/grpc++/impl/proto_server_reflection_plugin.h b/extensions/include/grpc++/impl/proto_server_reflection_plugin.h
index df0abb2b16..5bf1ff1bfc 100644
--- a/extensions/include/grpc++/impl/proto_server_reflection_plugin.h
+++ b/extensions/include/grpc++/impl/proto_server_reflection_plugin.h
@@ -34,8 +34,6 @@
 #ifndef GRPCXX_PROTO_SERVER_REFLECTION_PLUGIN_H
 #define GRPCXX_PROTO_SERVER_REFLECTION_PLUGIN_H
 
-#include <memory>
-
 #include <grpc++/impl/server_builder_plugin.h>
 #include <grpc++/support/config.h>
 
@@ -58,7 +56,7 @@ class ProtoServerReflectionPlugin : public ::grpc::ServerBuilderPlugin {
   bool has_sync_methods() const GRPC_OVERRIDE;
 
  private:
-  std::shared_ptr<::grpc::ProtoServerReflection> reflection_service;
+  std::shared_ptr<::grpc::ProtoServerReflection> reflection_service_;
 };
 
 std::unique_ptr<::grpc::ServerBuilderPlugin> CreateProtoReflection();
@@ -70,7 +68,7 @@ static struct StaticPluginInitializer_reflection {
   StaticPluginInitializer_reflection() {
     grpc_AddServerBuilderPlugin_reflection();
   }
-} static_plugin_initializer_reflection_;
+} static_plugin_initializer_reflection;
 
 }  // namespace reflection
 }  // namespace grpc
diff --git a/extensions/reflection/proto_server_reflection.cc b/extensions/reflection/proto_server_reflection.cc
index e41c67cdbc..f3cf7958e8 100644
--- a/extensions/reflection/proto_server_reflection.cc
+++ b/extensions/reflection/proto_server_reflection.cc
@@ -31,9 +31,6 @@
  *
  */
 
-#include <iostream>
-#include <memory>
-#include <string>
 #include <unordered_set>
 #include <vector>
 
diff --git a/extensions/reflection/proto_server_reflection.h b/extensions/reflection/proto_server_reflection.h
index f9b98c5fb3..71b316816c 100644
--- a/extensions/reflection/proto_server_reflection.h
+++ b/extensions/reflection/proto_server_reflection.h
@@ -34,9 +34,6 @@
 #ifndef GRPC_EXTENSIONS_REFLECTION_PROTO_SERVER_REFLECTION_H
 #define GRPC_EXTENSIONS_REFLECTION_PROTO_SERVER_REFLECTION_H
 
-#include <iostream>
-#include <memory>
-#include <string>
 #include <unordered_set>
 #include <vector>
 
diff --git a/extensions/reflection/proto_server_reflection_plugin.cc b/extensions/reflection/proto_server_reflection_plugin.cc
index d038a7fff5..465a8b9442 100644
--- a/extensions/reflection/proto_server_reflection_plugin.cc
+++ b/extensions/reflection/proto_server_reflection_plugin.cc
@@ -42,31 +42,33 @@ namespace grpc {
 namespace reflection {
 
 ProtoServerReflectionPlugin::ProtoServerReflectionPlugin()
-    : reflection_service(new grpc::ProtoServerReflection()) {}
+    : reflection_service_(new grpc::ProtoServerReflection()) {}
 
-grpc::string ProtoServerReflectionPlugin::name() { return "p1"; }
+grpc::string ProtoServerReflectionPlugin::name() {
+  return "proto_server_reflection";
+}
 
 void ProtoServerReflectionPlugin::InitServer(grpc::ServerInitializer* si) {
-  si->RegisterService(reflection_service);
+  si->RegisterService(reflection_service_);
 }
 
 void ProtoServerReflectionPlugin::Finish(grpc::ServerInitializer* si) {
-  reflection_service->SetServiceList(si->GetServiceList());
+  reflection_service_->SetServiceList(si->GetServiceList());
 }
 
 void ProtoServerReflectionPlugin::ChangeArguments(const grpc::string& name,
                                                   void* value) {}
 
 bool ProtoServerReflectionPlugin::has_sync_methods() const {
-  if (reflection_service != nullptr) {
-    return reflection_service->has_synchronous_methods();
+  if (reflection_service_ != nullptr) {
+    return reflection_service_->has_synchronous_methods();
   }
   return false;
 }
 
 bool ProtoServerReflectionPlugin::has_async_methods() const {
-  if (reflection_service != nullptr) {
-    return reflection_service->has_async_methods();
+  if (reflection_service_ != nullptr) {
+    return reflection_service_->has_async_methods();
   }
   return false;
 }
diff --git a/test/cpp/util/proto_reflection_descriptor_database.h b/test/cpp/util/proto_reflection_descriptor_database.h
index bc25fb0f5c..c6f7b5f046 100644
--- a/test/cpp/util/proto_reflection_descriptor_database.h
+++ b/test/cpp/util/proto_reflection_descriptor_database.h
@@ -31,7 +31,6 @@
  *
  */
 
-#include <memory>
 #include <mutex>
 #include <unordered_map>
 #include <unordered_set>
-- 
GitLab