Remove more files

include/grpcpp/channel.h.rej

@@ -1,102 +0,0 @@
---- include/grpcpp/channel.h
-+++ include/grpcpp/channel.h
-@@ -19,96 +19,16 @@
- #ifndef GRPCPP_CHANNEL_H
- #define GRPCPP_CHANNEL_H
- 
--#include <memory>
--#include <mutex>
--
--#include <grpc/grpc.h>
--#include <grpcpp/impl/call.h>
--#include <grpcpp/impl/codegen/channel_interface.h>
--#include <grpcpp/impl/codegen/client_interceptor.h>
--#include <grpcpp/impl/codegen/config.h>
--#include <grpcpp/impl/codegen/grpc_library.h>
--
--struct grpc_channel;
-+#include <grpcpp/channel_impl.h>
- 
- namespace grpc {
- 
-+typedef ::grpc_impl::Channel Channel;
-+
- namespace experimental {
--/// Resets the channel's connection backoff.
--/// TODO(roth): Once we see whether this proves useful, either create a gRFC
--/// and change this to be a method of the Channel class, or remove it.
- void ChannelResetConnectionBackoff(Channel* channel);
- }  // namespace experimental
- 
--/// Channels represent a connection to an endpoint. Created by \a CreateChannel.
--class Channel final : public ChannelInterface,
--                      public internal::CallHook,
--                      public std::enable_shared_from_this<Channel>,
--                      private GrpcLibraryCodegen {
-- public:
--  ~Channel();
--
--  /// Get the current channel state. If the channel is in IDLE and
--  /// \a try_to_connect is set to true, try to connect.
--  grpc_connectivity_state GetState(bool try_to_connect) override;
--
--  /// Returns the LB policy name, or the empty string if not yet available.
--  grpc::string GetLoadBalancingPolicyName() const;
--
--  /// Returns the service config in JSON form, or the empty string if
--  /// not available.
--  grpc::string GetServiceConfigJSON() const;
--
-- private:
--  template <class InputMessage, class OutputMessage>
--  friend class internal::BlockingUnaryCallImpl;
--  friend void experimental::ChannelResetConnectionBackoff(Channel* channel);
--  friend std::shared_ptr<Channel> CreateChannelInternal(
--      const grpc::string& host, grpc_channel* c_channel,
--      std::vector<
--          std::unique_ptr<experimental::ClientInterceptorFactoryInterface>>
--          interceptor_creators);
--  friend class internal::InterceptedChannel;
--  Channel(const grpc::string& host, grpc_channel* c_channel,
--          std::vector<
--              std::unique_ptr<experimental::ClientInterceptorFactoryInterface>>
--              interceptor_creators);
--
--  internal::Call CreateCall(const internal::RpcMethod& method,
--                            ClientContext* context,
--                            CompletionQueue* cq) override;
--  void PerformOpsOnCall(internal::CallOpSetInterface* ops,
--                        internal::Call* call) override;
--  void* RegisterMethod(const char* method) override;
--
--  void NotifyOnStateChangeImpl(grpc_connectivity_state last_observed,
--                               gpr_timespec deadline, CompletionQueue* cq,
--                               void* tag) override;
--  bool WaitForStateChangeImpl(grpc_connectivity_state last_observed,
--                              gpr_timespec deadline) override;
--
--  CompletionQueue* CallbackCQ() override;
--
--  internal::Call CreateCallInternal(const internal::RpcMethod& method,
--                                    ClientContext* context, CompletionQueue* cq,
--                                    size_t interceptor_pos) override;
--
--  const grpc::string host_;
--  grpc_channel* const c_channel_;  // owned
--
--  // mu_ protects callback_cq_ (the per-channel callbackable completion queue)
--  std::mutex mu_;
--
--  // callback_cq_ references the callbackable completion queue associated
--  // with this channel (if any). It is set on the first call to CallbackCQ().
--  // It is _not owned_ by the channel; ownership belongs with its internal
--  // shutdown callback tag (invoked when the CQ is fully shutdown).
--  CompletionQueue* callback_cq_ = nullptr;
--
--  std::vector<std::unique_ptr<experimental::ClientInterceptorFactoryInterface>>
--      interceptor_creators_;
--};
--
- }  // namespace grpc
- 
- #endif  // GRPCPP_CHANNEL_H

tools/run_tests/generated/sources_and_headers.json.rej

@@ -1,10 +0,0 @@
---- tools/run_tests/generated/sources_and_headers.json
-+++ tools/run_tests/generated/sources_and_headers.json
-@@ -11476,6 +11477,7 @@
-       "include/grpcpp/alarm.h", 
-       "include/grpcpp/alarm_impl.h", 
-       "include/grpcpp/channel.h", 
-+      "include/grpcpp/channel_impl.h", 
-       "include/grpcpp/client_context.h", 
-       "include/grpcpp/completion_queue.h", 
-       "include/grpcpp/create_channel.h",