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, 10 insertions, 10 deletions

diff --git a/src/test/cpp/blaze_startup_options_test.cc b/src/test/cpp/startup_options_test.cc
index 8729fdd349..c15bc28065 100644
--- a/src/test/cpp/blaze_startup_options_test.cc
+++ b/src/test/cpp/startup_options_test.cc
@@ -14,15 +14,15 @@
 
 #include <stdlib.h>
 
-#include "src/main/cpp/blaze_startup_options.h"
+#include "src/main/cpp/startup_options.h"
 #include "gtest/gtest.h"
 
 namespace blaze {
 
-class BlazeStartupOptionsTest : public ::testing::Test {
+class StartupOptionsTest : public ::testing::Test {
  protected:
-  BlazeStartupOptionsTest() = default;
-  ~BlazeStartupOptionsTest() = default;
+  StartupOptionsTest() = default;
+  ~StartupOptionsTest() = default;
 
   void SetUp() override {
     // This knowingly ignores the possibility of these environment variables
@@ -42,30 +42,30 @@ class BlazeStartupOptionsTest : public ::testing::Test {
   std::string old_test_tmpdir_;
 };
 
-TEST_F(BlazeStartupOptionsTest, OutputRootPreferTestTmpdirIfSet) {
+TEST_F(StartupOptionsTest, OutputRootPreferTestTmpdirIfSet) {
   setenv("HOME", "/nonexistent/home", 1);
   setenv("TEST_TMPDIR", "/nonexistent/tmpdir", 1);
 
-  blaze::BlazeStartupOptions startup_options;
+  blaze::StartupOptions startup_options(blaze::BAZEL_PRODUCT_NAME);
   ASSERT_EQ("/nonexistent/tmpdir", startup_options.output_root);
 }
 
-TEST_F(BlazeStartupOptionsTest, OutputRootUseHomeDirectory) {
+TEST_F(StartupOptionsTest, OutputRootUseHomeDirectory) {
   setenv("HOME", "/nonexistent/home", 1);
   unsetenv("TEST_TMPDIR");
 
-  blaze::BlazeStartupOptions startup_options;
+  blaze::StartupOptions startup_options(blaze::BAZEL_PRODUCT_NAME);
   ASSERT_EQ("/nonexistent/home/.cache/bazel", startup_options.output_root);
 }
 
-TEST_F(BlazeStartupOptionsTest, OutputRootUseBuiltin) {
+TEST_F(StartupOptionsTest, OutputRootUseBuiltin) {
   // We cannot just unsetenv("HOME") because the logic to compute the output
   // root falls back to using the passwd database if HOME is null... and mocking
   // that out is hard.
   setenv("HOME", "", 1);
   unsetenv("TEST_TMPDIR");
 
-  blaze::BlazeStartupOptions startup_options;
+  blaze::StartupOptions startup_options(blaze::BAZEL_PRODUCT_NAME);
   ASSERT_EQ("/tmp", startup_options.output_root);
 }