Remove the compiler options from ImportWriter.

Breaks the tie of the ImportWriter to the ObjC generation, allow grpc to use
a different extension and to relay the values they need for these.

- Pass in the two framework options to the ctor.
- Pass in the header extension to AddFile.

1 files changed, 6 insertions, 5 deletions

diff --git a/src/google/protobuf/compiler/objectivec/objectivec_helpers.h b/src/google/protobuf/compiler/objectivec/objectivec_helpers.h
index db303154..344723a6 100644
--- a/src/google/protobuf/compiler/objectivec/objectivec_helpers.h
+++ b/src/google/protobuf/compiler/objectivec/objectivec_helpers.h
@@ -230,11 +230,11 @@ bool ParseSimpleFile(
 // import statements.
 class LIBPROTOC_EXPORT ImportWriter {
  public:
-  ImportWriter(const Options& options)
-      : options_(options),
-        need_to_parse_mapping_file_(true) {}
+  ImportWriter(const string& generate_for_named_framework,
+               const string& named_framework_to_proto_path_mappings_path);
+  ~ImportWriter();
 
-  void AddFile(const FileDescriptor* file);
+  void AddFile(const FileDescriptor* file, const string& header_extension);
   void Print(io::Printer *printer) const;
 
  private:
@@ -251,7 +251,8 @@ class LIBPROTOC_EXPORT ImportWriter {
 
   void ParseFrameworkMappings();
 
-  const Options options_;
+  const string generate_for_named_framework_;
+  const string named_framework_to_proto_path_mappings_path_;
   map<string, string> proto_file_to_framework_name_;
   bool need_to_parse_mapping_file_;