Roll-forward of the startup options refactoring.

This CL is a verbatim reproduction of the following CLs, modulo adjustments
to cope with changes at HEAD:

* commit 4a45d92130a6b1306a3840d006df165b8040a6cf: Use inheritance to support site-specific options.
* commit dfb2c73eda3d2dd8787ea9b2d0a03b49dfa2acc5: Inject the product name via the per-product main.cc files.
* unknown commit: Remove the internal/external startup_options duality.

The cause that triggered the rollbacks was fixed separately in commit 69a8d7205287bedf3a6140ec9327e2fad1758c22
as prepartory work for this roll-forward, so things should work now.

--
MOS_MIGRATED_REVID=133139218

1 files changed, 4 insertions, 4 deletions

diff --git a/src/main/cpp/option_processor.h b/src/main/cpp/option_processor.h
index e9dd44c0f7..bb777e917b 100644
--- a/src/main/cpp/option_processor.h
+++ b/src/main/cpp/option_processor.h
@@ -21,7 +21,7 @@
 #include <string>
 #include <vector>
 
-#include "src/main/cpp/blaze_startup_options.h"
+#include "src/main/cpp/startup_options.h"
 #include "src/main/cpp/util/exit_code.h"
 
 namespace blaze {
@@ -33,7 +33,7 @@ using std::string;
 // to the server.
 class OptionProcessor {
  public:
-  OptionProcessor();
+  OptionProcessor(std::unique_ptr<StartupOptions> default_startup_options);
 
   virtual ~OptionProcessor();
 
@@ -59,7 +59,7 @@ class OptionProcessor {
   // executed in.
   void GetCommandArguments(std::vector<string>* result) const;
 
-  const BlazeStartupOptions& GetParsedStartupOptions() const;
+  StartupOptions* GetParsedStartupOptions() const;
 
   virtual blaze_exit_code::ExitCode FindUserBlazerc(const char* cmdLineRcFile,
                                                     const string& rc_basename,
@@ -115,7 +115,7 @@ class OptionProcessor {
   string command_;
   std::vector<string> command_arguments_;
   bool initialized_;
-  std::unique_ptr<BlazeStartupOptions> parsed_startup_options_;
+  std::unique_ptr<StartupOptions> parsed_startup_options_;
 };
 
 }  // namespace blaze